@cdklabs/multi-az-observability 0.0.1-alpha.33 → 0.0.1-alpha.35

package/.jsii

@@ -7342,13 +7342,28 @@
           "abstract": true,
           "docs": {
             "stability": "experimental",
-            "summary": "An alarm for fault count exceeding a regional threshold for all critical operations."
+            "summary": "An alarm indicating there is availability or latency impact on a critical operation that is not scoped to a single availability zone as measured by the server-side and/or canary (if present)."
           },
           "locationInModule": {
             "filename": "src/alarmsandrules/IServiceAlarmsAndRules.ts",
-            "line": 43
+            "line": 40
+          },
+          "name": "regionalImpactAlarm",
+          "type": {
+            "fqn": "aws-cdk-lib.aws_cloudwatch.IAlarm"
+          }
+        },
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "experimental",
+            "summary": "An alarm indicating there is availability or latency impact on a critical operation that is not scoped to a single availability zone as measured by the server-side."
+          },
+          "locationInModule": {
+            "filename": "src/alarmsandrules/IServiceAlarmsAndRules.ts",
+            "line": 46
           },
-          "name": "regionalFaultCountServerSideAlarm",
+          "name": "regionalServerSideImpactAlarm",
           "type": {
             "fqn": "aws-cdk-lib.aws_cloudwatch.IAlarm"
           }
@@ -7368,6 +7383,22 @@
             "fqn": "@cdklabs/multi-az-observability.IService"
           }
         },
+        {
+          "abstract": true,
+          "docs": {
+            "remarks": "It triggers\non any impact to a critical operation either zonally scoped or regionally scoped.",
+            "stability": "experimental",
+            "summary": "This is the top level alarm you should tie notifications/paging/alerting to."
+          },
+          "locationInModule": {
+            "filename": "src/alarmsandrules/IServiceAlarmsAndRules.ts",
+            "line": 52
+          },
+          "name": "serviceImpactAlarm",
+          "type": {
+            "fqn": "aws-cdk-lib.aws_cloudwatch.IAlarm"
+          }
+        },
         {
           "abstract": true,
           "docs": {
@@ -7385,14 +7416,14 @@
               "elementtype": {
                 "fqn": "aws-cdk-lib.aws_cloudwatch.IAlarm"
               },
-              "kind": "array"
+              "kind": "map"
             }
           }
         },
         {
           "abstract": true,
           "docs": {
-            "remarks": "There is 1 alarm per AZ that triggers\non availability or atency impact to any critical operation in that AZ. These are useful\nfor deployment monitoring to not inadvertently fail when a canary can't contact an AZ\nduring a deployment.",
+            "remarks": "There is 1 alarm per AZ that triggers\non availability or latency impact to any critical operation in that AZ. These are useful\nfor deployment monitoring to not inadvertently fail when a canary can't contact an AZ\nduring a deployment.",
             "stability": "experimental",
             "summary": "The zonal server-side isolated impact alarms."
           },
@@ -7406,7 +7437,7 @@
               "elementtype": {
                 "fqn": "aws-cdk-lib.aws_cloudwatch.IAlarm"
               },
-              "kind": "array"
+              "kind": "map"
             }
           }
         },
@@ -7414,29 +7445,13 @@
           "abstract": true,
           "docs": {
             "stability": "experimental",
-            "summary": "An alarm for regional availability impact of any critical operation as measured by the canary."
+            "summary": "An alarm indicating the canary has discovered an availability or latency impact on a critical operation while testing the regional endpoint."
           },
           "locationInModule": {
             "filename": "src/alarmsandrules/IServiceAlarmsAndRules.ts",
-            "line": 38
-          },
-          "name": "regionalAvailabilityCanaryAlarm",
-          "optional": true,
-          "type": {
-            "fqn": "aws-cdk-lib.aws_cloudwatch.IAlarm"
-          }
-        },
-        {
-          "abstract": true,
-          "docs": {
-            "stability": "experimental",
-            "summary": "An alarm for regional availability or latency impact of any critical operation as measured by the canary."
-          },
-          "locationInModule": {
-            "filename": "src/alarmsandrules/IServiceAlarmsAndRules.ts",
-            "line": 33
+            "line": 34
           },
-          "name": "regionalAvailabilityOrLatencyCanaryAlarm",
+          "name": "regionalCanaryAlarm",
           "optional": true,
           "type": {
             "fqn": "aws-cdk-lib.aws_cloudwatch.IAlarm"
@@ -10387,6 +10402,6 @@
       "symbolId": "src/services/props/ServiceProps:ServiceProps"
     }
   },
-  "version": "0.0.1-alpha.33",
-  "fingerprint": "c4ZKaskAM4zzFeSpKd2DpsRHahLvgQq+jqmz/LjNGLA="
+  "version": "0.0.1-alpha.35",
+  "fingerprint": "NQhLG+gPYcxMxShj535/ECq/3Ovu+VAXeaTMUZaJSZI="
 }

package/API.md

@@ -4893,24 +4893,37 @@ Service level alarms and rules using critical operations.
 
 | **Name** | **Type** | **Description** |
 | --- | --- | --- |
-| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalFaultCountServerSideAlarm">regionalFaultCountServerSideAlarm</a></code> | <code>aws-cdk-lib.aws_cloudwatch.IAlarm</code> | An alarm for fault count exceeding a regional threshold for all critical operations. |
+| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalImpactAlarm">regionalImpactAlarm</a></code> | <code>aws-cdk-lib.aws_cloudwatch.IAlarm</code> | An alarm indicating there is availability or latency impact on a critical operation that is not scoped to a single availability zone as measured by the server-side and/or canary (if present). |
+| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalServerSideImpactAlarm">regionalServerSideImpactAlarm</a></code> | <code>aws-cdk-lib.aws_cloudwatch.IAlarm</code> | An alarm indicating there is availability or latency impact on a critical operation that is not scoped to a single availability zone as measured by the server-side. |
 | <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.service">service</a></code> | <code><a href="#@cdklabs/multi-az-observability.IService">IService</a></code> | The service these alarms and rules are for. |
-| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.zonalAggregateIsolatedImpactAlarms">zonalAggregateIsolatedImpactAlarms</a></code> | <code>aws-cdk-lib.aws_cloudwatch.IAlarm[]</code> | The zonal aggregate isolated impact alarms. |
-| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.zonalServerSideIsolatedImpactAlarms">zonalServerSideIsolatedImpactAlarms</a></code> | <code>aws-cdk-lib.aws_cloudwatch.IAlarm[]</code> | The zonal server-side isolated impact alarms. |
-| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalAvailabilityCanaryAlarm">regionalAvailabilityCanaryAlarm</a></code> | <code>aws-cdk-lib.aws_cloudwatch.IAlarm</code> | An alarm for regional availability impact of any critical operation as measured by the canary. |
-| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalAvailabilityOrLatencyCanaryAlarm">regionalAvailabilityOrLatencyCanaryAlarm</a></code> | <code>aws-cdk-lib.aws_cloudwatch.IAlarm</code> | An alarm for regional availability or latency impact of any critical operation as measured by the canary. |
+| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.serviceImpactAlarm">serviceImpactAlarm</a></code> | <code>aws-cdk-lib.aws_cloudwatch.IAlarm</code> | This is the top level alarm you should tie notifications/paging/alerting to. |
+| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.zonalAggregateIsolatedImpactAlarms">zonalAggregateIsolatedImpactAlarms</a></code> | <code>{[ key: string ]: aws-cdk-lib.aws_cloudwatch.IAlarm}</code> | The zonal aggregate isolated impact alarms. |
+| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.zonalServerSideIsolatedImpactAlarms">zonalServerSideIsolatedImpactAlarms</a></code> | <code>{[ key: string ]: aws-cdk-lib.aws_cloudwatch.IAlarm}</code> | The zonal server-side isolated impact alarms. |
+| <code><a href="#@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalCanaryAlarm">regionalCanaryAlarm</a></code> | <code>aws-cdk-lib.aws_cloudwatch.IAlarm</code> | An alarm indicating the canary has discovered an availability or latency impact on a critical operation while testing the regional endpoint. |
 
 ---
 
-##### `regionalFaultCountServerSideAlarm`<sup>Required</sup> <a name="regionalFaultCountServerSideAlarm" id="@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalFaultCountServerSideAlarm"></a>
+##### `regionalImpactAlarm`<sup>Required</sup> <a name="regionalImpactAlarm" id="@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalImpactAlarm"></a>
 
 ```typescript
-public readonly regionalFaultCountServerSideAlarm: IAlarm;
+public readonly regionalImpactAlarm: IAlarm;
 ```
 
 - *Type:* aws-cdk-lib.aws_cloudwatch.IAlarm
 
-An alarm for fault count exceeding a regional threshold for all critical operations.
+An alarm indicating there is availability or latency impact on a critical operation that is not scoped to a single availability zone as measured by the server-side and/or canary (if present).
+
+---
+
+##### `regionalServerSideImpactAlarm`<sup>Required</sup> <a name="regionalServerSideImpactAlarm" id="@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalServerSideImpactAlarm"></a>
+
+```typescript
+public readonly regionalServerSideImpactAlarm: IAlarm;
+```
+
+- *Type:* aws-cdk-lib.aws_cloudwatch.IAlarm
+
+An alarm indicating there is availability or latency impact on a critical operation that is not scoped to a single availability zone as measured by the server-side.
 
 ---
 
@@ -4926,13 +4939,28 @@ The service these alarms and rules are for.
 
 ---
 
+##### `serviceImpactAlarm`<sup>Required</sup> <a name="serviceImpactAlarm" id="@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.serviceImpactAlarm"></a>
+
+```typescript
+public readonly serviceImpactAlarm: IAlarm;
+```
+
+- *Type:* aws-cdk-lib.aws_cloudwatch.IAlarm
+
+This is the top level alarm you should tie notifications/paging/alerting to.
+
+It triggers
+on any impact to a critical operation either zonally scoped or regionally scoped.
+
+---
+
 ##### `zonalAggregateIsolatedImpactAlarms`<sup>Required</sup> <a name="zonalAggregateIsolatedImpactAlarms" id="@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.zonalAggregateIsolatedImpactAlarms"></a>
 
 ```typescript
-public readonly zonalAggregateIsolatedImpactAlarms: IAlarm[];
+public readonly zonalAggregateIsolatedImpactAlarms: {[ key: string ]: IAlarm};
 ```
 
-- *Type:* aws-cdk-lib.aws_cloudwatch.IAlarm[]
+- *Type:* {[ key: string ]: aws-cdk-lib.aws_cloudwatch.IAlarm}
 
 The zonal aggregate isolated impact alarms.
 
@@ -4945,41 +4973,29 @@ that indicates it has isolated impact as measured by canaries or server-side.
 ##### `zonalServerSideIsolatedImpactAlarms`<sup>Required</sup> <a name="zonalServerSideIsolatedImpactAlarms" id="@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.zonalServerSideIsolatedImpactAlarms"></a>
 
 ```typescript
-public readonly zonalServerSideIsolatedImpactAlarms: IAlarm[];
+public readonly zonalServerSideIsolatedImpactAlarms: {[ key: string ]: IAlarm};
 ```
 
-- *Type:* aws-cdk-lib.aws_cloudwatch.IAlarm[]
+- *Type:* {[ key: string ]: aws-cdk-lib.aws_cloudwatch.IAlarm}
 
 The zonal server-side isolated impact alarms.
 
 There is 1 alarm per AZ that triggers
-on availability or atency impact to any critical operation in that AZ. These are useful
+on availability or latency impact to any critical operation in that AZ. These are useful
 for deployment monitoring to not inadvertently fail when a canary can't contact an AZ
 during a deployment.
 
 ---
 
-##### `regionalAvailabilityCanaryAlarm`<sup>Optional</sup> <a name="regionalAvailabilityCanaryAlarm" id="@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalAvailabilityCanaryAlarm"></a>
-
-```typescript
-public readonly regionalAvailabilityCanaryAlarm: IAlarm;
-```
-
-- *Type:* aws-cdk-lib.aws_cloudwatch.IAlarm
-
-An alarm for regional availability impact of any critical operation as measured by the canary.
-
----
-
-##### `regionalAvailabilityOrLatencyCanaryAlarm`<sup>Optional</sup> <a name="regionalAvailabilityOrLatencyCanaryAlarm" id="@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalAvailabilityOrLatencyCanaryAlarm"></a>
+##### `regionalCanaryAlarm`<sup>Optional</sup> <a name="regionalCanaryAlarm" id="@cdklabs/multi-az-observability.IServiceAlarmsAndRules.property.regionalCanaryAlarm"></a>
 
 ```typescript
-public readonly regionalAvailabilityOrLatencyCanaryAlarm: IAlarm;
+public readonly regionalCanaryAlarm: IAlarm;
 ```
 
 - *Type:* aws-cdk-lib.aws_cloudwatch.IAlarm
 
-An alarm for regional availability or latency impact of any critical operation as measured by the canary.
+An alarm indicating the canary has discovered an availability or latency impact on a critical operation while testing the regional endpoint.
 
 ---
 

package/lib/alarmsandrules/IOperationAlarmsAndRules.d.ts

@@ -13,7 +13,8 @@ export interface IOperationAlarmsAndRules {
      */
     readonly operation: IOperation;
     /**
-     * An alarm indicating regionally scoped impact, not zonal
+     * An alarm indicating availability or latency impact has been detected by the server-side
+     * and/or canary (if present) and the impact is regionally scoped, not zonal
      */
     readonly regionalImpactAlarm: IAlarm;
     /**
@@ -25,15 +26,15 @@ export interface IOperationAlarmsAndRules {
      */
     readonly canaryRegionalAlarmsAndRules?: ICanaryOperationRegionalAlarmsAndRules;
     /**
-     * The aggregate zonal alarm indexed by Availability Zone name.
+     * The aggregate, server-side and canary combined, zonal alarm indexed by Availability Zone name.
      */
-    readonly aggregateZonalAlarmsMap: {
+    readonly aggregateZonalAlarms: {
         [key: string]: IAlarm;
     };
     /**
      * The server side zonal alarms and rules, indexed by Availability Zone name.
      */
-    readonly serverSideZonalAlarmsAndRulesMap: {
+    readonly serverSideZonalAlarmsAndRules: {
         [key: string]: IServerSideOperationZonalAlarmsAndRules;
     };
     /**
@@ -41,7 +42,7 @@ export interface IOperationAlarmsAndRules {
      *
      * @default - This is an empty dictionary if canary metric details are not provided
      */
-    readonly canaryZonalAlarmsAndRulesMap?: {
+    readonly canaryZonalAlarmsAndRules?: {
         [key: string]: ICanaryOperationZonalAlarmsAndRules;
     };
 }

package/lib/alarmsandrules/IOperationAlarmsAndRules.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSU9wZXJhdGlvbkFsYXJtc0FuZFJ1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FsYXJtc2FuZHJ1bGVzL0lPcGVyYXRpb25BbGFybXNBbmRSdWxlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4vLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuaW1wb3J0IHsgSUFsYXJtIH0gZnJvbSAnYXdzLWNkay1saWIvYXdzLWNsb3Vkd2F0Y2gnO1xuaW1wb3J0IHsgSUNhbmFyeU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lDYW5hcnlPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzJztcbmltcG9ydCB7IElDYW5hcnlPcGVyYXRpb25ab25hbEFsYXJtc0FuZFJ1bGVzIH0gZnJvbSAnLi9JQ2FuYXJ5T3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJU2VydmVyU2lkZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lTZXJ2ZXJTaWRlT3BlcmF0aW9uUmVnaW9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJU2VydmVyU2lkZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lTZXJ2ZXJTaWRlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJT3BlcmF0aW9uIH0gZnJvbSAnLi4vc2VydmljZXMvSU9wZXJhdGlvbic7XG5cbi8qKlxuICogQ3JlYXRlcyBhbGFybXMgYW5kIHJ1bGVzIGZvciBhbiBvcGVyYXRpb24gZm9yIGJvdGggcmVnaW9uYWwgYW5kIHpvbmFsIG1ldHJpY3NcbiAqL1xuZXhwb3J0IGludGVyZmFjZSBJT3BlcmF0aW9uQWxhcm1zQW5kUnVsZXMge1xuICAvKipcbiAgICogVGhlIG9wZXJhdGlvbiB0aGUgYWxhcm1zIGFuZCBydWxlcyBhcmUgY3JlYXRlZCBmb3JcbiAgICovXG4gIHJlYWRvbmx5IG9wZXJhdGlvbjogSU9wZXJhdGlvbjtcblxuICAvKipcbiAgICogQW4gYWxhcm0gaW5kaWNhdGluZyByZWdpb25hbGx5IHNjb3BlZCBpbXBhY3QsIG5vdCB6b25hbFxuICAgKi9cbiAgcmVhZG9ubHkgcmVnaW9uYWxJbXBhY3RBbGFybTogSUFsYXJtO1xuXG4gIC8qKlxuICAgKiBUaGUgc2VydmVyIHNpZGUgcmVnaW9uYWwgYWxhcm1zIGFuZCBydWxlc1xuICAgKi9cbiAgcmVhZG9ubHkgc2VydmVyU2lkZVJlZ2lvbmFsQWxhcm1zQW5kUnVsZXM6IElTZXJ2ZXJTaWRlT3BlcmF0aW9uUmVnaW9uYWxBbGFybXNBbmRSdWxlcztcblxuICAvKipcbiAgICogVGhlIGNhbmFyeSByZWdpb25hbCBhbGFybXMgYW5kIHJ1bGVzXG4gICAqL1xuICByZWFkb25seSBjYW5hcnlSZWdpb25hbEFsYXJtc0FuZFJ1bGVzPzogSUNhbmFyeU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXM7XG5cbiAgLyoqXG4gICAqIFRoZSBhZ2dyZWdhdGUgem9uYWwgYWxhcm0gaW5kZXhlZCBieSBBdmFpbGFiaWxpdHkgWm9uZSBuYW1lLlxuICAgKi9cbiAgcmVhZG9ubHkgYWdncmVnYXRlWm9uYWxBbGFybXNNYXA6IHsgW2tleTogc3RyaW5nXTogSUFsYXJtIH07XG5cbiAgLyoqXG4gICAqIFRoZSBzZXJ2ZXIgc2lkZSB6b25hbCBhbGFybXMgYW5kIHJ1bGVzLCBpbmRleGVkIGJ5IEF2YWlsYWJpbGl0eSBab25lIG5hbWUuXG4gICAqL1xuICByZWFkb25seSBzZXJ2ZXJTaWRlWm9uYWxBbGFybXNBbmRSdWxlc01hcDoge1trZXk6IHN0cmluZ106IElTZXJ2ZXJTaWRlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlc307XG5cbiAgLyoqXG4gICAqIFRoZSBjYW5hcnkgem9uYWwgYWxhcm1zIGFuZCBydWxlcywgaW5kZXhlZCBieSBBdmFpbGFiaWxpdHkgWm9uZSBuYW1lLlxuICAgKiBcbiAgICogQGRlZmF1bHQgLSBUaGlzIGlzIGFuIGVtcHR5IGRpY3Rpb25hcnkgaWYgY2FuYXJ5IG1ldHJpYyBkZXRhaWxzIGFyZSBub3QgcHJvdmlkZWRcbiAgICovXG4gIHJlYWRvbmx5IGNhbmFyeVpvbmFsQWxhcm1zQW5kUnVsZXNNYXA/OiB7W2tleTogc3RyaW5nXTogSUNhbmFyeU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXN9O1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSU9wZXJhdGlvbkFsYXJtc0FuZFJ1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FsYXJtc2FuZHJ1bGVzL0lPcGVyYXRpb25BbGFybXNBbmRSdWxlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4vLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuaW1wb3J0IHsgSUFsYXJtIH0gZnJvbSAnYXdzLWNkay1saWIvYXdzLWNsb3Vkd2F0Y2gnO1xuaW1wb3J0IHsgSUNhbmFyeU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lDYW5hcnlPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzJztcbmltcG9ydCB7IElDYW5hcnlPcGVyYXRpb25ab25hbEFsYXJtc0FuZFJ1bGVzIH0gZnJvbSAnLi9JQ2FuYXJ5T3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJU2VydmVyU2lkZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lTZXJ2ZXJTaWRlT3BlcmF0aW9uUmVnaW9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJU2VydmVyU2lkZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lTZXJ2ZXJTaWRlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJT3BlcmF0aW9uIH0gZnJvbSAnLi4vc2VydmljZXMvSU9wZXJhdGlvbic7XG5cbi8qKlxuICogQ3JlYXRlcyBhbGFybXMgYW5kIHJ1bGVzIGZvciBhbiBvcGVyYXRpb24gZm9yIGJvdGggcmVnaW9uYWwgYW5kIHpvbmFsIG1ldHJpY3NcbiAqL1xuZXhwb3J0IGludGVyZmFjZSBJT3BlcmF0aW9uQWxhcm1zQW5kUnVsZXMge1xuICAvKipcbiAgICogVGhlIG9wZXJhdGlvbiB0aGUgYWxhcm1zIGFuZCBydWxlcyBhcmUgY3JlYXRlZCBmb3JcbiAgICovXG4gIHJlYWRvbmx5IG9wZXJhdGlvbjogSU9wZXJhdGlvbjtcblxuICAvKipcbiAgICogQW4gYWxhcm0gaW5kaWNhdGluZyBhdmFpbGFiaWxpdHkgb3IgbGF0ZW5jeSBpbXBhY3QgaGFzIGJlZW4gZGV0ZWN0ZWQgYnkgdGhlIHNlcnZlci1zaWRlIFxuICAgKiBhbmQvb3IgY2FuYXJ5IChpZiBwcmVzZW50KSBhbmQgdGhlIGltcGFjdCBpcyByZWdpb25hbGx5IHNjb3BlZCwgbm90IHpvbmFsXG4gICAqL1xuICByZWFkb25seSByZWdpb25hbEltcGFjdEFsYXJtOiBJQWxhcm07XG5cbiAgLyoqXG4gICAqIFRoZSBzZXJ2ZXIgc2lkZSByZWdpb25hbCBhbGFybXMgYW5kIHJ1bGVzXG4gICAqL1xuICByZWFkb25seSBzZXJ2ZXJTaWRlUmVnaW9uYWxBbGFybXNBbmRSdWxlczogSVNlcnZlclNpZGVPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzO1xuXG4gIC8qKlxuICAgKiBUaGUgY2FuYXJ5IHJlZ2lvbmFsIGFsYXJtcyBhbmQgcnVsZXNcbiAgICovXG4gIHJlYWRvbmx5IGNhbmFyeVJlZ2lvbmFsQWxhcm1zQW5kUnVsZXM/OiBJQ2FuYXJ5T3BlcmF0aW9uUmVnaW9uYWxBbGFybXNBbmRSdWxlcztcblxuICAvKipcbiAgICogVGhlIGFnZ3JlZ2F0ZSwgc2VydmVyLXNpZGUgYW5kIGNhbmFyeSBjb21iaW5lZCwgem9uYWwgYWxhcm0gaW5kZXhlZCBieSBBdmFpbGFiaWxpdHkgWm9uZSBuYW1lLlxuICAgKi9cbiAgcmVhZG9ubHkgYWdncmVnYXRlWm9uYWxBbGFybXM6IHtba2V5OiBzdHJpbmddOiBJQWxhcm19O1xuXG4gIC8qKlxuICAgKiBUaGUgc2VydmVyIHNpZGUgem9uYWwgYWxhcm1zIGFuZCBydWxlcywgaW5kZXhlZCBieSBBdmFpbGFiaWxpdHkgWm9uZSBuYW1lLlxuICAgKi9cbiAgcmVhZG9ubHkgc2VydmVyU2lkZVpvbmFsQWxhcm1zQW5kUnVsZXM6IHtba2V5OiBzdHJpbmddOiBJU2VydmVyU2lkZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXN9O1xuXG4gIC8qKlxuICAgKiBUaGUgY2FuYXJ5IHpvbmFsIGFsYXJtcyBhbmQgcnVsZXMsIGluZGV4ZWQgYnkgQXZhaWxhYmlsaXR5IFpvbmUgbmFtZS5cbiAgICogXG4gICAqIEBkZWZhdWx0IC0gVGhpcyBpcyBhbiBlbXB0eSBkaWN0aW9uYXJ5IGlmIGNhbmFyeSBtZXRyaWMgZGV0YWlscyBhcmUgbm90IHByb3ZpZGVkXG4gICAqL1xuICByZWFkb25seSBjYW5hcnlab25hbEFsYXJtc0FuZFJ1bGVzPzoge1trZXk6IHN0cmluZ106IElDYW5hcnlPcGVyYXRpb25ab25hbEFsYXJtc0FuZFJ1bGVzfTtcbn1cbiJdfQ==

package/lib/alarmsandrules/IServiceAlarmsAndRules.d.ts

@@ -13,24 +13,36 @@ export interface IServiceAlarmsAndRules {
      * triggers for availability or latency impact to any critical operation in that AZ
      * that indicates it has isolated impact as measured by canaries or server-side.
      */
-    zonalAggregateIsolatedImpactAlarms: IAlarm[];
+    zonalAggregateIsolatedImpactAlarms: {
+        [key: string]: IAlarm;
+    };
     /**
      * The zonal server-side isolated impact alarms. There is 1 alarm per AZ that triggers
-     * on availability or atency impact to any critical operation in that AZ. These are useful
+     * on availability or latency impact to any critical operation in that AZ. These are useful
      * for deployment monitoring to not inadvertently fail when a canary can't contact an AZ
      * during a deployment.
      */
-    zonalServerSideIsolatedImpactAlarms: IAlarm[];
+    zonalServerSideIsolatedImpactAlarms: {
+        [key: string]: IAlarm;
+    };
     /**
-     * An alarm for regional availability or latency impact of any critical operation as measured by the canary.
+     * An alarm indicating the canary has discovered an availability or latency impact on a critical
+     * operation while testing the regional endpoint.
      */
-    regionalAvailabilityOrLatencyCanaryAlarm?: IAlarm;
+    regionalCanaryAlarm?: IAlarm;
     /**
-     * An alarm for regional availability impact of any critical operation as measured by the canary.
+     * An alarm indicating there is availability or latency impact on a critical operation
+     * that is not scoped to a single availability zone as measured by the server-side and/or canary (if present)
      */
-    regionalAvailabilityCanaryAlarm?: IAlarm;
+    regionalImpactAlarm: IAlarm;
     /**
-     * An alarm for fault count exceeding a regional threshold for all critical operations.
+     * An alarm indicating there is availability or latency impact on a critical operation
+     * that is not scoped to a single availability zone as measured by the server-side
      */
-    regionalFaultCountServerSideAlarm: IAlarm;
+    regionalServerSideImpactAlarm: IAlarm;
+    /**
+     * This is the top level alarm you should tie notifications/paging/alerting to. It triggers
+     * on any impact to a critical operation either zonally scoped or regionally scoped.
+     */
+    serviceImpactAlarm: IAlarm;
 }

package/lib/alarmsandrules/IServiceAlarmsAndRules.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSVNlcnZpY2VBbGFybXNBbmRSdWxlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hbGFybXNhbmRydWxlcy9JU2VydmljZUFsYXJtc0FuZFJ1bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3B5cmlnaHQgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbi8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBBcGFjaGUtMi4wXG5pbXBvcnQgeyBJQWxhcm0gfSBmcm9tICdhd3MtY2RrLWxpYi9hd3MtY2xvdWR3YXRjaCc7XG5pbXBvcnQgeyBJU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL0lTZXJ2aWNlJztcblxuLyoqXG4gKiBTZXJ2aWNlIGxldmVsIGFsYXJtcyBhbmQgcnVsZXMgdXNpbmcgY3JpdGljYWwgb3BlcmF0aW9uc1xuICovXG5leHBvcnQgaW50ZXJmYWNlIElTZXJ2aWNlQWxhcm1zQW5kUnVsZXMge1xuICAvKipcbiAgICogVGhlIHNlcnZpY2UgdGhlc2UgYWxhcm1zIGFuZCBydWxlcyBhcmUgZm9yXG4gICAqL1xuICBzZXJ2aWNlOiBJU2VydmljZTtcblxuICAvKipcbiAgICogVGhlIHpvbmFsIGFnZ3JlZ2F0ZSBpc29sYXRlZCBpbXBhY3QgYWxhcm1zLiBUaGVyZSBpcyAxIGFsYXJtIHBlciBBWiB0aGF0XG4gICAqIHRyaWdnZXJzIGZvciBhdmFpbGFiaWxpdHkgb3IgbGF0ZW5jeSBpbXBhY3QgdG8gYW55IGNyaXRpY2FsIG9wZXJhdGlvbiBpbiB0aGF0IEFaXG4gICAqIHRoYXQgaW5kaWNhdGVzIGl0IGhhcyBpc29sYXRlZCBpbXBhY3QgYXMgbWVhc3VyZWQgYnkgY2FuYXJpZXMgb3Igc2VydmVyLXNpZGUuXG4gICAqL1xuICB6b25hbEFnZ3JlZ2F0ZUlzb2xhdGVkSW1wYWN0QWxhcm1zOiBJQWxhcm1bXTtcblxuICAvKipcbiAgICogVGhlIHpvbmFsIHNlcnZlci1zaWRlIGlzb2xhdGVkIGltcGFjdCBhbGFybXMuIFRoZXJlIGlzIDEgYWxhcm0gcGVyIEFaIHRoYXQgdHJpZ2dlcnNcbiAgICogb24gYXZhaWxhYmlsaXR5IG9yIGF0ZW5jeSBpbXBhY3QgdG8gYW55IGNyaXRpY2FsIG9wZXJhdGlvbiBpbiB0aGF0IEFaLiBUaGVzZSBhcmUgdXNlZnVsXG4gICAqIGZvciBkZXBsb3ltZW50IG1vbml0b3JpbmcgdG8gbm90IGluYWR2ZXJ0ZW50bHkgZmFpbCB3aGVuIGEgY2FuYXJ5IGNhbid0IGNvbnRhY3QgYW4gQVpcbiAgICogZHVyaW5nIGEgZGVwbG95bWVudC5cbiAgICovXG4gIHpvbmFsU2VydmVyU2lkZUlzb2xhdGVkSW1wYWN0QWxhcm1zOiBJQWxhcm1bXTtcblxuICAvKipcbiAgICogQW4gYWxhcm0gZm9yIHJlZ2lvbmFsIGF2YWlsYWJpbGl0eSBvciBsYXRlbmN5IGltcGFjdCBvZiBhbnkgY3JpdGljYWwgb3BlcmF0aW9uIGFzIG1lYXN1cmVkIGJ5IHRoZSBjYW5hcnkuXG4gICAqL1xuICByZWdpb25hbEF2YWlsYWJpbGl0eU9yTGF0ZW5jeUNhbmFyeUFsYXJtPzogSUFsYXJtO1xuXG4gIC8qKlxuICAgKiBBbiBhbGFybSBmb3IgcmVnaW9uYWwgYXZhaWxhYmlsaXR5IGltcGFjdCBvZiBhbnkgY3JpdGljYWwgb3BlcmF0aW9uIGFzIG1lYXN1cmVkIGJ5IHRoZSBjYW5hcnkuXG4gICAqL1xuICByZWdpb25hbEF2YWlsYWJpbGl0eUNhbmFyeUFsYXJtPzogSUFsYXJtO1xuXG4gIC8qKlxuICAgKiBBbiBhbGFybSBmb3IgZmF1bHQgY291bnQgZXhjZWVkaW5nIGEgcmVnaW9uYWwgdGhyZXNob2xkIGZvciBhbGwgY3JpdGljYWwgb3BlcmF0aW9ucy5cbiAgICovXG4gIHJlZ2lvbmFsRmF1bHRDb3VudFNlcnZlclNpZGVBbGFybTogSUFsYXJtO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSVNlcnZpY2VBbGFybXNBbmRSdWxlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hbGFybXNhbmRydWxlcy9JU2VydmljZUFsYXJtc0FuZFJ1bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3B5cmlnaHQgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbi8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBBcGFjaGUtMi4wXG5pbXBvcnQgeyBJQWxhcm0gfSBmcm9tICdhd3MtY2RrLWxpYi9hd3MtY2xvdWR3YXRjaCc7XG5pbXBvcnQgeyBJU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL0lTZXJ2aWNlJztcblxuLyoqXG4gKiBTZXJ2aWNlIGxldmVsIGFsYXJtcyBhbmQgcnVsZXMgdXNpbmcgY3JpdGljYWwgb3BlcmF0aW9uc1xuICovXG5leHBvcnQgaW50ZXJmYWNlIElTZXJ2aWNlQWxhcm1zQW5kUnVsZXMge1xuICAvKipcbiAgICogVGhlIHNlcnZpY2UgdGhlc2UgYWxhcm1zIGFuZCBydWxlcyBhcmUgZm9yXG4gICAqL1xuICBzZXJ2aWNlOiBJU2VydmljZTtcblxuICAvKipcbiAgICogVGhlIHpvbmFsIGFnZ3JlZ2F0ZSBpc29sYXRlZCBpbXBhY3QgYWxhcm1zLiBUaGVyZSBpcyAxIGFsYXJtIHBlciBBWiB0aGF0XG4gICAqIHRyaWdnZXJzIGZvciBhdmFpbGFiaWxpdHkgb3IgbGF0ZW5jeSBpbXBhY3QgdG8gYW55IGNyaXRpY2FsIG9wZXJhdGlvbiBpbiB0aGF0IEFaXG4gICAqIHRoYXQgaW5kaWNhdGVzIGl0IGhhcyBpc29sYXRlZCBpbXBhY3QgYXMgbWVhc3VyZWQgYnkgY2FuYXJpZXMgb3Igc2VydmVyLXNpZGUuXG4gICAqL1xuICB6b25hbEFnZ3JlZ2F0ZUlzb2xhdGVkSW1wYWN0QWxhcm1zOiB7W2tleTogc3RyaW5nXTogSUFsYXJtfTtcblxuICAvKipcbiAgICogVGhlIHpvbmFsIHNlcnZlci1zaWRlIGlzb2xhdGVkIGltcGFjdCBhbGFybXMuIFRoZXJlIGlzIDEgYWxhcm0gcGVyIEFaIHRoYXQgdHJpZ2dlcnNcbiAgICogb24gYXZhaWxhYmlsaXR5IG9yIGxhdGVuY3kgaW1wYWN0IHRvIGFueSBjcml0aWNhbCBvcGVyYXRpb24gaW4gdGhhdCBBWi4gVGhlc2UgYXJlIHVzZWZ1bFxuICAgKiBmb3IgZGVwbG95bWVudCBtb25pdG9yaW5nIHRvIG5vdCBpbmFkdmVydGVudGx5IGZhaWwgd2hlbiBhIGNhbmFyeSBjYW4ndCBjb250YWN0IGFuIEFaXG4gICAqIGR1cmluZyBhIGRlcGxveW1lbnQuXG4gICAqL1xuICB6b25hbFNlcnZlclNpZGVJc29sYXRlZEltcGFjdEFsYXJtczoge1trZXk6IHN0cmluZ106IElBbGFybX07XG5cbiAgLyoqXG4gICAqIEFuIGFsYXJtIGluZGljYXRpbmcgdGhlIGNhbmFyeSBoYXMgZGlzY292ZXJlZCBhbiBhdmFpbGFiaWxpdHkgb3IgbGF0ZW5jeSBpbXBhY3Qgb24gYSBjcml0aWNhbFxuICAgKiBvcGVyYXRpb24gd2hpbGUgdGVzdGluZyB0aGUgcmVnaW9uYWwgZW5kcG9pbnQuXG4gICAqL1xuICByZWdpb25hbENhbmFyeUFsYXJtPzogSUFsYXJtO1xuXG4gIC8qKlxuICAgKiBBbiBhbGFybSBpbmRpY2F0aW5nIHRoZXJlIGlzIGF2YWlsYWJpbGl0eSBvciBsYXRlbmN5IGltcGFjdCBvbiBhIGNyaXRpY2FsIG9wZXJhdGlvblxuICAgKiB0aGF0IGlzIG5vdCBzY29wZWQgdG8gYSBzaW5nbGUgYXZhaWxhYmlsaXR5IHpvbmUgYXMgbWVhc3VyZWQgYnkgdGhlIHNlcnZlci1zaWRlIGFuZC9vciBjYW5hcnkgKGlmIHByZXNlbnQpXG4gICAqL1xuICByZWdpb25hbEltcGFjdEFsYXJtOiBJQWxhcm07XG5cbiAgLyoqXG4gICAqIEFuIGFsYXJtIGluZGljYXRpbmcgdGhlcmUgaXMgYXZhaWxhYmlsaXR5IG9yIGxhdGVuY3kgaW1wYWN0IG9uIGEgY3JpdGljYWwgb3BlcmF0aW9uXG4gICAqIHRoYXQgaXMgbm90IHNjb3BlZCB0byBhIHNpbmdsZSBhdmFpbGFiaWxpdHkgem9uZSBhcyBtZWFzdXJlZCBieSB0aGUgc2VydmVyLXNpZGVcbiAgICovXG4gIHJlZ2lvbmFsU2VydmVyU2lkZUltcGFjdEFsYXJtOiBJQWxhcm07XG5cbiAgLyoqXG4gICAqIFRoaXMgaXMgdGhlIHRvcCBsZXZlbCBhbGFybSB5b3Ugc2hvdWxkIHRpZSBub3RpZmljYXRpb25zL3BhZ2luZy9hbGVydGluZyB0by4gSXQgdHJpZ2dlcnNcbiAgICogb24gYW55IGltcGFjdCB0byBhIGNyaXRpY2FsIG9wZXJhdGlvbiBlaXRoZXIgem9uYWxseSBzY29wZWQgb3IgcmVnaW9uYWxseSBzY29wZWQuXG4gICAqL1xuICBzZXJ2aWNlSW1wYWN0QWxhcm06IElBbGFybTtcbn1cbiJdfQ==

package/lib/alarmsandrules/OperationAlarmsAndRules.d.ts

@@ -26,17 +26,18 @@ export declare class OperationAlarmsAndRules extends Construct implements IOpera
     /**
      * The aggregate zonal alarm indexed by Availability Zone Id.
      */
-    readonly aggregateZonalAlarmsMap: {
+    readonly aggregateZonalAlarms: {
         [key: string]: IAlarm;
     };
     /**
-     * An alarm indicating regionally scoped impact, not zonal
+     * An alarm indicating availability or latency impact has been detected by the server-side
+     * and/or canary (if present) and the impact is regionally scoped, not zonal
      */
     readonly regionalImpactAlarm: IAlarm;
     /**
      * The server side zonal alarms and rules, indexed by Availability Zone name.
      */
-    readonly serverSideZonalAlarmsAndRulesMap: {
+    readonly serverSideZonalAlarmsAndRules: {
         [key: string]: IServerSideOperationZonalAlarmsAndRules;
     };
     /**
@@ -44,7 +45,7 @@ export declare class OperationAlarmsAndRules extends Construct implements IOpera
      *
      * @default - This is an empty dictionary if canary metric details are not provided
      */
-    readonly canaryZonalAlarmsAndRulesMap?: {
+    readonly canaryZonalAlarmsAndRules?: {
         [key: string]: ICanaryOperationZonalAlarmsAndRules;
     };
     constructor(scope: Construct, id: string, props: OperationAlarmsAndRulesProps);

package/lib/alarmsandrules/OperationAlarmsAndRules.js

@@ -16,9 +16,9 @@ class OperationAlarmsAndRules extends constructs_1.Construct {
     constructor(scope, id, props) {
         super(scope, id);
         this.operation = props.operation;
-        this.aggregateZonalAlarmsMap = {};
-        this.serverSideZonalAlarmsAndRulesMap = {};
-        this.canaryZonalAlarmsAndRulesMap = {};
+        this.aggregateZonalAlarms = {};
+        this.serverSideZonalAlarmsAndRules = {};
+        this.canaryZonalAlarmsAndRules = {};
         let loadBalancerArn = '';
         if (props.loadBalancer) {
             loadBalancerArn = props.loadBalancer
@@ -60,7 +60,7 @@ class OperationAlarmsAndRules extends constructs_1.Construct {
                 counter: index,
                 nameSuffix: '-server'
             });
-            this.serverSideZonalAlarmsAndRulesMap[availabilityZone] = serverSideZonalAlarmsAndRules;
+            this.serverSideZonalAlarmsAndRules[availabilityZone] = serverSideZonalAlarmsAndRules;
             if (props.operation.canaryMetricDetails) {
                 let canaryZonalAlarmsAndRules = new CanaryOperationZonalAlarmsAndRules_1.CanaryOperationZonalAlarmsAndRules(this, props.operation.operationName +
                     'AZ' +
@@ -71,7 +71,7 @@ class OperationAlarmsAndRules extends constructs_1.Construct {
                     counter: index,
                     nameSuffix: '-canary'
                 });
-                this.canaryZonalAlarmsAndRulesMap[availabilityZone] = canaryZonalAlarmsAndRules;
+                this.canaryZonalAlarmsAndRules[availabilityZone] = canaryZonalAlarmsAndRules;
                 let aggAlarm = new aws_cloudwatch_1.CompositeAlarm(this, props.operation.operationName +
                     'AZ' +
                     index +
@@ -80,7 +80,7 @@ class OperationAlarmsAndRules extends constructs_1.Construct {
                         '-' +
                         props.operation.operationName.toLowerCase() +
                         '-aggregate-isolated-az-impact',
-                    alarmRule: aws_cloudwatch_1.AlarmRule.anyOf(this.canaryZonalAlarmsAndRulesMap[availabilityZone].isolatedImpactAlarm, this.serverSideZonalAlarmsAndRulesMap[availabilityZone].isolatedImpactAlarm),
+                    alarmRule: aws_cloudwatch_1.AlarmRule.anyOf(this.canaryZonalAlarmsAndRules[availabilityZone].isolatedImpactAlarm, this.serverSideZonalAlarmsAndRules[availabilityZone].isolatedImpactAlarm),
                     actionsEnabled: false,
                     alarmDescription: '{"loadBalancer":"' +
                         loadBalancerArn +
@@ -88,10 +88,10 @@ class OperationAlarmsAndRules extends constructs_1.Construct {
                         availabilityZoneId +
                         '"}',
                 });
-                this.aggregateZonalAlarmsMap[availabilityZone] = aggAlarm;
+                this.aggregateZonalAlarms[availabilityZone] = aggAlarm;
             }
             else {
-                this.aggregateZonalAlarmsMap[availabilityZone] = this.serverSideZonalAlarmsAndRulesMap[availabilityZone].isolatedImpactAlarm;
+                this.aggregateZonalAlarms[availabilityZone] = this.serverSideZonalAlarmsAndRules[availabilityZone].isolatedImpactAlarm;
             }
         });
         // Create a regional impact alarm that is triggered if regional
@@ -100,16 +100,16 @@ class OperationAlarmsAndRules extends constructs_1.Construct {
         if (props.operation.canaryMetricDetails) {
             this.regionalImpactAlarm = new aws_cloudwatch_1.CompositeAlarm(this, props.operation.operationName + "-regional-impact-alarm", {
                 compositeAlarmName: `${props.operation.service.serviceName.toLowerCase()}-${props.operation.operationName.toLowerCase()}-regional-impact`,
-                alarmRule: aws_cloudwatch_1.AlarmRule.allOf(aws_cloudwatch_1.AlarmRule.anyOf(this.serverSideRegionalAlarmsAndRules.availabilityOrLatencyAlarm, this.canaryRegionalAlarmsAndRules.availabilityOrLatencyAlarm), aws_cloudwatch_1.AlarmRule.not(aws_cloudwatch_1.AlarmRule.anyOf(...Object.values(this.aggregateZonalAlarmsMap))))
+                alarmRule: aws_cloudwatch_1.AlarmRule.allOf(aws_cloudwatch_1.AlarmRule.anyOf(this.serverSideRegionalAlarmsAndRules.availabilityOrLatencyAlarm, this.canaryRegionalAlarmsAndRules.availabilityOrLatencyAlarm), aws_cloudwatch_1.AlarmRule.not(aws_cloudwatch_1.AlarmRule.anyOf(...Object.values(this.aggregateZonalAlarms))))
             });
         }
         else {
             this.regionalImpactAlarm = new aws_cloudwatch_1.CompositeAlarm(this, props.operation.operationName + "-regional-impact-alarm", {
                 compositeAlarmName: `${props.operation.service.serviceName.toLowerCase()}-${props.operation.operationName.toLowerCase()}-regional-impact`,
-                alarmRule: aws_cloudwatch_1.AlarmRule.allOf(this.serverSideRegionalAlarmsAndRules.availabilityOrLatencyAlarm, aws_cloudwatch_1.AlarmRule.not(aws_cloudwatch_1.AlarmRule.anyOf(...Object.values(this.aggregateZonalAlarmsMap))))
+                alarmRule: aws_cloudwatch_1.AlarmRule.allOf(this.serverSideRegionalAlarmsAndRules.availabilityOrLatencyAlarm, aws_cloudwatch_1.AlarmRule.not(aws_cloudwatch_1.AlarmRule.anyOf(...Object.values(this.aggregateZonalAlarms))))
             });
         }
     }
 }
 exports.OperationAlarmsAndRules = OperationAlarmsAndRules;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"OperationAlarmsAndRules.js","sourceRoot":"","sources":["../../src/alarmsandrules/OperationAlarmsAndRules.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { AlarmRule, CompositeAlarm, IAlarm } from 'aws-cdk-lib/aws-cloudwatch';\nimport { BaseLoadBalancer } from 'aws-cdk-lib/aws-elasticloadbalancingv2';\nimport { Construct } from 'constructs';\nimport { CanaryOperationRegionalAlarmsAndRules } from './CanaryOperationRegionalAlarmsAndRules';\nimport { CanaryOperationZonalAlarmsAndRules } from './CanaryOperationZonalAlarmsAndRules';\nimport { ICanaryOperationRegionalAlarmsAndRules } from './ICanaryOperationRegionalAlarmsAndRules';\nimport { ICanaryOperationZonalAlarmsAndRules } from './ICanaryOperationZonalAlarmsAndRules';\nimport { IOperationAlarmsAndRules } from './IOperationAlarmsAndRules';\nimport { IServerSideOperationRegionalAlarmsAndRules } from './IServerSideOperationRegionalAlarmsAndRules';\nimport { IServerSideOperationZonalAlarmsAndRules } from './IServerSideOperationZonalAlarmsAndRules';\nimport { OperationAlarmsAndRulesProps } from './props/OperationAlarmsAndRulesProps';\nimport { ServerSideOperationRegionalAlarmsAndRules } from './ServerSideOperationRegionalAlarmsAndRules';\nimport { ServerSideOperationZonalAlarmsAndRules } from './ServerSideOperationZonalAlarmsAndRules';\nimport { IOperation } from '../services/IOperation';\n\n/**\n * Creates alarms and rules for an operation for both regional and zonal metrics\n */\nexport class OperationAlarmsAndRules\n  extends Construct\n  implements IOperationAlarmsAndRules {\n  /**\n   * The operation the alarms and rules are created for\n   */\n  readonly operation: IOperation;\n\n  /**\n   * The server side regional alarms and rules\n   */\n  readonly serverSideRegionalAlarmsAndRules: IServerSideOperationRegionalAlarmsAndRules;\n\n  /**\n   * The canary regional alarms and rules\n   */\n  readonly canaryRegionalAlarmsAndRules?: ICanaryOperationRegionalAlarmsAndRules;\n\n  /**\n   * The aggregate zonal alarm indexed by Availability Zone Id.\n   */\n  readonly aggregateZonalAlarmsMap: { [key: string]: IAlarm };\n\n  /**\n   * An alarm indicating regionally scoped impact, not zonal\n   */\n  readonly regionalImpactAlarm: IAlarm;\n\n  /**\n   * The server side zonal alarms and rules, indexed by Availability Zone name.\n   */\n  readonly serverSideZonalAlarmsAndRulesMap: {[key: string]: IServerSideOperationZonalAlarmsAndRules};\n\n  /**\n   * The canary zonal alarms and rules, indexed by Availability Zone name.\n   * \n   * @default - This is an empty dictionary if canary metric details are not provided\n   */\n  readonly canaryZonalAlarmsAndRulesMap?: {[key: string]: ICanaryOperationZonalAlarmsAndRules};\n\n  constructor(\n    scope: Construct,\n    id: string,\n    props: OperationAlarmsAndRulesProps,\n  ) {\n    super(scope, id);\n\n    this.operation = props.operation;\n    this.aggregateZonalAlarmsMap = {};\n    this.serverSideZonalAlarmsAndRulesMap = {};\n    this.canaryZonalAlarmsAndRulesMap = {};\n\n    let loadBalancerArn: string = '';\n\n    if (props.loadBalancer) {\n      loadBalancerArn = (props.loadBalancer as BaseLoadBalancer)\n        .loadBalancerArn;\n    }\n\n    // Creates the regional impact alarms and contributor insight rules\n    // for contributors to regional faults and latency\n    this.serverSideRegionalAlarmsAndRules =\n      new ServerSideOperationRegionalAlarmsAndRules(\n        this,\n        props.operation.operationName + 'ServerSideRegionalAlarms',\n        {\n          availabilityMetricDetails:\n            props.operation.serverSideAvailabilityMetricDetails,\n          latencyMetricDetails: props.operation.serverSideLatencyMetricDetails,\n          contributorInsightRuleDetails: props.operation\n            .serverSideContributorInsightRuleDetails\n            ? props.operation.serverSideContributorInsightRuleDetails\n            : props.operation.service.defaultContributorInsightRuleDetails,\n          nameSuffix: '-server',\n        },\n      );\n\n    // If canary metrics are defined, create the regional impact\n    // alarms \n    if (props.operation.canaryMetricDetails) {\n      this.canaryRegionalAlarmsAndRules =\n        new CanaryOperationRegionalAlarmsAndRules(\n          this,\n          props.operation.operationName + 'CanaryRegionalAlarms',\n          {\n            availabilityMetricDetails:\n              props.operation.canaryMetricDetails\n                .canaryAvailabilityMetricDetails,\n            latencyMetricDetails:\n              props.operation.canaryMetricDetails.canaryLatencyMetricDetails,\n            nameSuffix: '-canary',\n          },\n        );\n    }\n\n    // Create the zonal isolated impact alarms\n    props.operation.service.availabilityZoneNames.forEach((availabilityZone: string, index: number) => {\n      let azLetter: string = availabilityZone.substring(availabilityZone.length - 1);\n      let availabilityZoneId: string = props.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(azLetter);\n\n      let serverSideZonalAlarmsAndRules: IServerSideOperationZonalAlarmsAndRules = new ServerSideOperationZonalAlarmsAndRules(\n        this,\n        props.operation.operationName +\n          'AZ' +\n          index +\n          'ServerSideZonalAlarmsAndRules',\n        {\n          availabilityZone: availabilityZone,\n          operationAlarmsAndRulesProps: props,\n          counter: index,\n          nameSuffix: '-server'\n        },\n      );\n\n      this.serverSideZonalAlarmsAndRulesMap[availabilityZone] = serverSideZonalAlarmsAndRules;\n\n      if (props.operation.canaryMetricDetails) {\n        let canaryZonalAlarmsAndRules: ICanaryOperationZonalAlarmsAndRules = new CanaryOperationZonalAlarmsAndRules(\n          this,\n          props.operation.operationName +\n            'AZ' +\n            index +\n            'CanaryZonalAlarmsAndRules',\n          {\n            availabilityZone: availabilityZone,\n            operationAlarmsAndRulesProps: props,\n            counter: index,\n            nameSuffix: '-canary'\n          },\n        );\n\n        this.canaryZonalAlarmsAndRulesMap![availabilityZone] = canaryZonalAlarmsAndRules;\n\n        let aggAlarm: IAlarm = new CompositeAlarm(\n          this,\n          props.operation.operationName +\n            'AZ' +\n            index +\n            'AggregateZonalIsolatedImpactAlarm',\n          {\n            compositeAlarmName:\n              availabilityZoneId +\n              '-' +\n              props.operation.operationName.toLowerCase() +\n              '-aggregate-isolated-az-impact',\n            alarmRule: AlarmRule.anyOf(\n              this.canaryZonalAlarmsAndRulesMap![availabilityZone].isolatedImpactAlarm,\n              this.serverSideZonalAlarmsAndRulesMap[availabilityZone].isolatedImpactAlarm\n            ),\n            actionsEnabled: false,\n            alarmDescription:\n              '{\"loadBalancer\":\"' +\n              loadBalancerArn +\n              '\",\"az-id\":\"' +\n              availabilityZoneId +\n              '\"}',\n          },\n        );\n        \n        this.aggregateZonalAlarmsMap[availabilityZone] = aggAlarm;\n      } else {       \n        this.aggregateZonalAlarmsMap[availabilityZone] = this.serverSideZonalAlarmsAndRulesMap[availabilityZone].isolatedImpactAlarm    \n      }\n    });\n\n    // Create a regional impact alarm that is triggered if regional\n    // metrics for availability or latency drop and there isn't a single\n    // AZ impact alarm \n    if (props.operation.canaryMetricDetails) {\n      this.regionalImpactAlarm = new CompositeAlarm(this, props.operation.operationName + \"-regional-impact-alarm\", {\n        compositeAlarmName: `${props.operation.service.serviceName.toLowerCase()}-${props.operation.operationName.toLowerCase()}-regional-impact`,\n        alarmRule: AlarmRule.allOf(\n          AlarmRule.anyOf(\n            this.serverSideRegionalAlarmsAndRules.availabilityOrLatencyAlarm,\n            this.canaryRegionalAlarmsAndRules!.availabilityOrLatencyAlarm\n          ),\n          AlarmRule.not(\n            AlarmRule.anyOf(\n              ...Object.values(this.aggregateZonalAlarmsMap)\n            )\n          )\n        )\n      });\n    }\n    else {\n      this.regionalImpactAlarm = new CompositeAlarm(this, props.operation.operationName + \"-regional-impact-alarm\", {\n        compositeAlarmName: `${props.operation.service.serviceName.toLowerCase()}-${props.operation.operationName.toLowerCase()}-regional-impact`,\n        alarmRule: AlarmRule.allOf(\n          this.serverSideRegionalAlarmsAndRules.availabilityOrLatencyAlarm,     \n          AlarmRule.not(\n            AlarmRule.anyOf(\n              ...Object.values(this.aggregateZonalAlarmsMap)\n            )\n          )\n        )\n      });\n    }\n  }\n}"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"OperationAlarmsAndRules.js","sourceRoot":"","sources":["../../src/alarmsandrules/OperationAlarmsAndRules.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { AlarmRule, CompositeAlarm, IAlarm } from 'aws-cdk-lib/aws-cloudwatch';\nimport { BaseLoadBalancer } from 'aws-cdk-lib/aws-elasticloadbalancingv2';\nimport { Construct } from 'constructs';\nimport { CanaryOperationRegionalAlarmsAndRules } from './CanaryOperationRegionalAlarmsAndRules';\nimport { CanaryOperationZonalAlarmsAndRules } from './CanaryOperationZonalAlarmsAndRules';\nimport { ICanaryOperationRegionalAlarmsAndRules } from './ICanaryOperationRegionalAlarmsAndRules';\nimport { ICanaryOperationZonalAlarmsAndRules } from './ICanaryOperationZonalAlarmsAndRules';\nimport { IOperationAlarmsAndRules } from './IOperationAlarmsAndRules';\nimport { IServerSideOperationRegionalAlarmsAndRules } from './IServerSideOperationRegionalAlarmsAndRules';\nimport { IServerSideOperationZonalAlarmsAndRules } from './IServerSideOperationZonalAlarmsAndRules';\nimport { OperationAlarmsAndRulesProps } from './props/OperationAlarmsAndRulesProps';\nimport { ServerSideOperationRegionalAlarmsAndRules } from './ServerSideOperationRegionalAlarmsAndRules';\nimport { ServerSideOperationZonalAlarmsAndRules } from './ServerSideOperationZonalAlarmsAndRules';\nimport { IOperation } from '../services/IOperation';\n\n/**\n * Creates alarms and rules for an operation for both regional and zonal metrics\n */\nexport class OperationAlarmsAndRules\n  extends Construct\n  implements IOperationAlarmsAndRules {\n  /**\n   * The operation the alarms and rules are created for\n   */\n  readonly operation: IOperation;\n\n  /**\n   * The server side regional alarms and rules\n   */\n  readonly serverSideRegionalAlarmsAndRules: IServerSideOperationRegionalAlarmsAndRules;\n\n  /**\n   * The canary regional alarms and rules\n   */\n  readonly canaryRegionalAlarmsAndRules?: ICanaryOperationRegionalAlarmsAndRules;\n\n  /**\n   * The aggregate zonal alarm indexed by Availability Zone Id.\n   */\n  readonly aggregateZonalAlarms: { [key: string]: IAlarm };\n\n  /**\n   * An alarm indicating availability or latency impact has been detected by the server-side \n   * and/or canary (if present) and the impact is regionally scoped, not zonal\n   */\n  readonly regionalImpactAlarm: IAlarm;\n\n  /**\n   * The server side zonal alarms and rules, indexed by Availability Zone name.\n   */\n  readonly serverSideZonalAlarmsAndRules: {[key: string]: IServerSideOperationZonalAlarmsAndRules};\n\n  /**\n   * The canary zonal alarms and rules, indexed by Availability Zone name.\n   * \n   * @default - This is an empty dictionary if canary metric details are not provided\n   */\n  readonly canaryZonalAlarmsAndRules?: {[key: string]: ICanaryOperationZonalAlarmsAndRules};\n\n  constructor(\n    scope: Construct,\n    id: string,\n    props: OperationAlarmsAndRulesProps,\n  ) {\n    super(scope, id);\n\n    this.operation = props.operation;\n    this.aggregateZonalAlarms = {};\n    this.serverSideZonalAlarmsAndRules = {};\n    this.canaryZonalAlarmsAndRules = {};\n\n    let loadBalancerArn: string = '';\n\n    if (props.loadBalancer) {\n      loadBalancerArn = (props.loadBalancer as BaseLoadBalancer)\n        .loadBalancerArn;\n    }\n\n    // Creates the regional impact alarms and contributor insight rules\n    // for contributors to regional faults and latency\n    this.serverSideRegionalAlarmsAndRules =\n      new ServerSideOperationRegionalAlarmsAndRules(\n        this,\n        props.operation.operationName + 'ServerSideRegionalAlarms',\n        {\n          availabilityMetricDetails:\n            props.operation.serverSideAvailabilityMetricDetails,\n          latencyMetricDetails: props.operation.serverSideLatencyMetricDetails,\n          contributorInsightRuleDetails: props.operation\n            .serverSideContributorInsightRuleDetails\n            ? props.operation.serverSideContributorInsightRuleDetails\n            : props.operation.service.defaultContributorInsightRuleDetails,\n          nameSuffix: '-server',\n        },\n      );\n\n    // If canary metrics are defined, create the regional impact\n    // alarms \n    if (props.operation.canaryMetricDetails) {\n      this.canaryRegionalAlarmsAndRules =\n        new CanaryOperationRegionalAlarmsAndRules(\n          this,\n          props.operation.operationName + 'CanaryRegionalAlarms',\n          {\n            availabilityMetricDetails:\n              props.operation.canaryMetricDetails\n                .canaryAvailabilityMetricDetails,\n            latencyMetricDetails:\n              props.operation.canaryMetricDetails.canaryLatencyMetricDetails,\n            nameSuffix: '-canary',\n          },\n        );\n    }\n\n    // Create the zonal isolated impact alarms\n    props.operation.service.availabilityZoneNames.forEach((availabilityZone: string, index: number) => {\n      let azLetter: string = availabilityZone.substring(availabilityZone.length - 1);\n      let availabilityZoneId: string = props.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(azLetter);\n\n      let serverSideZonalAlarmsAndRules: IServerSideOperationZonalAlarmsAndRules = new ServerSideOperationZonalAlarmsAndRules(\n        this,\n        props.operation.operationName +\n          'AZ' +\n          index +\n          'ServerSideZonalAlarmsAndRules',\n        {\n          availabilityZone: availabilityZone,\n          operationAlarmsAndRulesProps: props,\n          counter: index,\n          nameSuffix: '-server'\n        },\n      );\n\n      this.serverSideZonalAlarmsAndRules[availabilityZone] = serverSideZonalAlarmsAndRules;\n\n      if (props.operation.canaryMetricDetails) {\n        let canaryZonalAlarmsAndRules: ICanaryOperationZonalAlarmsAndRules = new CanaryOperationZonalAlarmsAndRules(\n          this,\n          props.operation.operationName +\n            'AZ' +\n            index +\n            'CanaryZonalAlarmsAndRules',\n          {\n            availabilityZone: availabilityZone,\n            operationAlarmsAndRulesProps: props,\n            counter: index,\n            nameSuffix: '-canary'\n          },\n        );\n\n        this.canaryZonalAlarmsAndRules![availabilityZone] = canaryZonalAlarmsAndRules;\n\n        let aggAlarm: IAlarm = new CompositeAlarm(\n          this,\n          props.operation.operationName +\n            'AZ' +\n            index +\n            'AggregateZonalIsolatedImpactAlarm',\n          {\n            compositeAlarmName:\n              availabilityZoneId +\n              '-' +\n              props.operation.operationName.toLowerCase() +\n              '-aggregate-isolated-az-impact',\n            alarmRule: AlarmRule.anyOf(\n              this.canaryZonalAlarmsAndRules![availabilityZone].isolatedImpactAlarm,\n              this.serverSideZonalAlarmsAndRules[availabilityZone].isolatedImpactAlarm\n            ),\n            actionsEnabled: false,\n            alarmDescription:\n              '{\"loadBalancer\":\"' +\n              loadBalancerArn +\n              '\",\"az-id\":\"' +\n              availabilityZoneId +\n              '\"}',\n          },\n        );\n        \n        this.aggregateZonalAlarms[availabilityZone] = aggAlarm;\n      } else {       \n        this.aggregateZonalAlarms[availabilityZone] = this.serverSideZonalAlarmsAndRules[availabilityZone].isolatedImpactAlarm    \n      }\n    });\n\n    // Create a regional impact alarm that is triggered if regional\n    // metrics for availability or latency drop and there isn't a single\n    // AZ impact alarm \n    if (props.operation.canaryMetricDetails) {\n      this.regionalImpactAlarm = new CompositeAlarm(this, props.operation.operationName + \"-regional-impact-alarm\", {\n        compositeAlarmName: `${props.operation.service.serviceName.toLowerCase()}-${props.operation.operationName.toLowerCase()}-regional-impact`,\n        alarmRule: AlarmRule.allOf(\n          AlarmRule.anyOf(\n            this.serverSideRegionalAlarmsAndRules.availabilityOrLatencyAlarm,\n            this.canaryRegionalAlarmsAndRules!.availabilityOrLatencyAlarm\n          ),\n          AlarmRule.not(\n            AlarmRule.anyOf(\n              ...Object.values(this.aggregateZonalAlarms)\n            )\n          )\n        )\n      });\n    }\n    else {\n      this.regionalImpactAlarm = new CompositeAlarm(this, props.operation.operationName + \"-regional-impact-alarm\", {\n        compositeAlarmName: `${props.operation.service.serviceName.toLowerCase()}-${props.operation.operationName.toLowerCase()}-regional-impact`,\n        alarmRule: AlarmRule.allOf(\n          this.serverSideRegionalAlarmsAndRules.availabilityOrLatencyAlarm,     \n          AlarmRule.not(\n            AlarmRule.anyOf(\n              ...Object.values(this.aggregateZonalAlarms)\n            )\n          )\n        )\n      });\n    }\n  }\n}"]}

package/lib/alarmsandrules/ServiceAlarmsAndRules.d.ts

@@ -16,31 +16,37 @@ export declare class ServiceAlarmsAndRules extends Construct implements IService
      * triggers for availability or latency impact to any critical operation in that AZ
      * that indicates it has isolated impact as measured by canaries or server-side.
      */
-    zonalAggregateIsolatedImpactAlarms: IAlarm[];
+    zonalAggregateIsolatedImpactAlarms: {
+        [key: string]: IAlarm;
+    };
     /**
      * The zonal server-side isolated impact alarms. There is 1 alarm per AZ that triggers
-     * on availability or atency impact to any critical operation in that AZ. These are useful
+     * on availability or latency impact to any critical operation in that AZ. These are useful
      * for deployment monitoring to not inadvertently fail when a canary can't contact an AZ
      * during a deployment.
      */
-    zonalServerSideIsolatedImpactAlarms: IAlarm[];
+    zonalServerSideIsolatedImpactAlarms: {
+        [key: string]: IAlarm;
+    };
     /**
-     * An alarm for regional availability or latency impact of any critical operation as measured by the canary.
+     * An alarm indicating the canary has discovered an availability or latency impact on a critical
+     * operation while testing the regional endpoint.
      */
-    regionalAvailabilityOrLatencyCanaryAlarm?: IAlarm;
+    regionalCanaryAlarm?: IAlarm;
     /**
-     * An alarm for regional availability impact of any critical operation as measured by the canary.
+     * An alarm indicating there is availability or latency impact on a critical operation
+     * that is not scoped to a single availability zone as measured by the server-side and/or canary (if present)
      */
-    regionalAvailabilityCanaryAlarm?: IAlarm;
+    regionalImpactAlarm: IAlarm;
     /**
-     * An alarm for regional availability or latency impact of any critical operation as measured by the server-side.
+     * An alarm indicating there is availability or latency impact on a critical operation
+     * that is not scoped to a single availability zone as measured by the server-side
      */
+    regionalServerSideImpactAlarm: IAlarm;
     /**
-     * An alarm for regional availability impact of any critical operation as measured by the server-side.
+     * This is the top level alarm you should tie notifications/paging/alerting to. It triggers
+     * on any impact to a critical operation either zonally scoped or regionally scoped.
      */
-    /**
-     * An alarm for fault count exceeding a regional threshold for all critical operations.
-     */
-    regionalFaultCountServerSideAlarm: IAlarm;
+    serviceImpactAlarm: IAlarm;
     constructor(scope: Construct, id: string, props: ServiceAlarmsAndRulesProps);
 }