@cdklabs/multi-az-observability 0.0.1-alpha.4 → 0.0.1-alpha.41

package/lib/alarmsandrules/BaseOperationRegionalAlarmsAndRules.js

@@ -14,8 +14,8 @@ class BaseOperationRegionalAlarmsAndRules extends constructs_1.Construct {
         this.latencyAlarm =
             AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createRegionalLatencyAlarm(this, props.latencyMetricDetails, props.nameSuffix);
         this.availabilityOrLatencyAlarm =
-            AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createRegionalCustomerExperienceAlarm(this, props.availabilityMetricDetails.operationName, props.nameSuffix, this.availabilityAlarm, this.latencyAlarm);
+            AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createRegionalAvailabilityOrLatencyImpactAlarm(this, props.availabilityMetricDetails.operationName, props.nameSuffix, this.availabilityAlarm, this.latencyAlarm);
     }
 }
 exports.BaseOperationRegionalAlarmsAndRules = BaseOperationRegionalAlarmsAndRules;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWxhcm1zYW5kcnVsZXMvQmFzZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EsMkNBQXVDO0FBQ3ZDLGlHQUE4RjtBQUk5Rjs7R0FFRztBQUNILE1BQXNCLG1DQUNwQixTQUFRLHNCQUFTO0lBaUJqQixZQUNFLEtBQWdCLEVBQ2hCLEVBQVUsRUFDVixLQUErQztRQUUvQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLElBQUksQ0FBQyxpQkFBaUI7WUFDcEIsMkVBQW9DLENBQUMsK0JBQStCLENBQ2xFLElBQUksRUFDSixLQUFLLENBQUMseUJBQXlCLEVBQy9CLEtBQUssQ0FBQyxVQUFVLENBQ2pCLENBQUM7UUFDSixJQUFJLENBQUMsWUFBWTtZQUNmLDJFQUFvQyxDQUFDLDBCQUEwQixDQUM3RCxJQUFJLEVBQ0osS0FBSyxDQUFDLG9CQUFvQixFQUMxQixLQUFLLENBQUMsVUFBVSxDQUNqQixDQUFDO1FBQ0osSUFBSSxDQUFDLDBCQUEwQjtZQUM3QiwyRUFBb0MsQ0FBQyxxQ0FBcUMsQ0FDeEUsSUFBSSxFQUNKLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxhQUFhLEVBQzdDLEtBQUssQ0FBQyxVQUFVLEVBQ2hCLElBQUksQ0FBQyxpQkFBaUIsRUFDdEIsSUFBSSxDQUFDLFlBQVksQ0FDbEIsQ0FBQztJQUNOLENBQUM7Q0FDRjtBQTlDRCxrRkE4Q0MiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3B5cmlnaHQgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbi8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBBcGFjaGUtMi4wXG5pbXBvcnQgeyBJQWxhcm0gfSBmcm9tICdhd3MtY2RrLWxpYi9hd3MtY2xvdWR3YXRjaCc7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdjb25zdHJ1Y3RzJztcbmltcG9ydCB7IEF2YWlsYWJpbGl0eUFuZExhdGVuY3lBbGFybXNBbmRSdWxlcyB9IGZyb20gJy4vQXZhaWxhYmlsaXR5QW5kTGF0ZW5jeUFsYXJtc0FuZFJ1bGVzJztcbmltcG9ydCB7IElCYXNlT3BlcmF0aW9uUmVnaW9uYWxBbGFybXNBbmRSdWxlcyB9IGZyb20gJy4vSUJhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzJztcbmltcG9ydCB7IEJhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzUHJvcHMgfSBmcm9tICcuL3Byb3BzL0Jhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzUHJvcHMnO1xuXG4vKipcbiAqIEJhc2Ugb3BlcmF0aW9uIHJlZ2lvbmFsIGFsYXJtcyBhbmQgcnVsZXNcbiAqL1xuZXhwb3J0IGFic3RyYWN0IGNsYXNzIEJhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzXG4gIGV4dGVuZHMgQ29uc3RydWN0XG4gIGltcGxlbWVudHMgSUJhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzIHtcbiAgLyoqXG4gICAqIEF2YWlsYWJpbGl0eSBhbGFybSBmb3IgdGhpcyBvcGVyYXRpb25cbiAgICovXG4gIGF2YWlsYWJpbGl0eUFsYXJtOiBJQWxhcm07XG5cbiAgLyoqXG4gICAqIExhdGVuY3kgYWxhcm0gZm9yIHRoaXMgb3BlcmF0aW9uXG4gICAqL1xuICBsYXRlbmN5QWxhcm06IElBbGFybTtcblxuICAvKipcbiAgICogQ29tcG9zaXRlIGFsYXJtIGZvciBlaXRoZXIgYXZhaWxhYmlsdGl5IG9yIGxhdGVuY3kgaW1wYWN0IHRvIHRoaXMgb3BlcmF0aW9uXG4gICAqL1xuICBhdmFpbGFiaWxpdHlPckxhdGVuY3lBbGFybTogSUFsYXJtO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHNjb3BlOiBDb25zdHJ1Y3QsXG4gICAgaWQ6IHN0cmluZyxcbiAgICBwcm9wczogQmFzZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXNQcm9wcyxcbiAgKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIHRoaXMuYXZhaWxhYmlsaXR5QWxhcm0gPVxuICAgICAgQXZhaWxhYmlsaXR5QW5kTGF0ZW5jeUFsYXJtc0FuZFJ1bGVzLmNyZWF0ZVJlZ2lvbmFsQXZhaWxhYmlsaXR5QWxhcm0oXG4gICAgICAgIHRoaXMsXG4gICAgICAgIHByb3BzLmF2YWlsYWJpbGl0eU1ldHJpY0RldGFpbHMsXG4gICAgICAgIHByb3BzLm5hbWVTdWZmaXgsXG4gICAgICApO1xuICAgIHRoaXMubGF0ZW5jeUFsYXJtID1cbiAgICAgIEF2YWlsYWJpbGl0eUFuZExhdGVuY3lBbGFybXNBbmRSdWxlcy5jcmVhdGVSZWdpb25hbExhdGVuY3lBbGFybShcbiAgICAgICAgdGhpcyxcbiAgICAgICAgcHJvcHMubGF0ZW5jeU1ldHJpY0RldGFpbHMsXG4gICAgICAgIHByb3BzLm5hbWVTdWZmaXgsXG4gICAgICApO1xuICAgIHRoaXMuYXZhaWxhYmlsaXR5T3JMYXRlbmN5QWxhcm0gPVxuICAgICAgQXZhaWxhYmlsaXR5QW5kTGF0ZW5jeUFsYXJtc0FuZFJ1bGVzLmNyZWF0ZVJlZ2lvbmFsQ3VzdG9tZXJFeHBlcmllbmNlQWxhcm0oXG4gICAgICAgIHRoaXMsXG4gICAgICAgIHByb3BzLmF2YWlsYWJpbGl0eU1ldHJpY0RldGFpbHMub3BlcmF0aW9uTmFtZSxcbiAgICAgICAgcHJvcHMubmFtZVN1ZmZpeCxcbiAgICAgICAgdGhpcy5hdmFpbGFiaWxpdHlBbGFybSxcbiAgICAgICAgdGhpcy5sYXRlbmN5QWxhcm0sXG4gICAgICApO1xuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWxhcm1zYW5kcnVsZXMvQmFzZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EsMkNBQXVDO0FBQ3ZDLGlHQUE4RjtBQUk5Rjs7R0FFRztBQUNILE1BQXNCLG1DQUNwQixTQUFRLHNCQUFTO0lBaUJqQixZQUNFLEtBQWdCLEVBQ2hCLEVBQVUsRUFDVixLQUErQztRQUUvQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLElBQUksQ0FBQyxpQkFBaUI7WUFDcEIsMkVBQW9DLENBQUMsK0JBQStCLENBQ2xFLElBQUksRUFDSixLQUFLLENBQUMseUJBQXlCLEVBQy9CLEtBQUssQ0FBQyxVQUFVLENBQ2pCLENBQUM7UUFDSixJQUFJLENBQUMsWUFBWTtZQUNmLDJFQUFvQyxDQUFDLDBCQUEwQixDQUM3RCxJQUFJLEVBQ0osS0FBSyxDQUFDLG9CQUFvQixFQUMxQixLQUFLLENBQUMsVUFBVSxDQUNqQixDQUFDO1FBQ0osSUFBSSxDQUFDLDBCQUEwQjtZQUM3QiwyRUFBb0MsQ0FBQyw4Q0FBOEMsQ0FDakYsSUFBSSxFQUNKLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxhQUFhLEVBQzdDLEtBQUssQ0FBQyxVQUFVLEVBQ2hCLElBQUksQ0FBQyxpQkFBaUIsRUFDdEIsSUFBSSxDQUFDLFlBQVksQ0FDbEIsQ0FBQztJQUNOLENBQUM7Q0FDRjtBQTlDRCxrRkE4Q0MiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBDb3B5cmlnaHQgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbi8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBBcGFjaGUtMi4wXG5pbXBvcnQgeyBJQWxhcm0gfSBmcm9tICdhd3MtY2RrLWxpYi9hd3MtY2xvdWR3YXRjaCc7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdjb25zdHJ1Y3RzJztcbmltcG9ydCB7IEF2YWlsYWJpbGl0eUFuZExhdGVuY3lBbGFybXNBbmRSdWxlcyB9IGZyb20gJy4vQXZhaWxhYmlsaXR5QW5kTGF0ZW5jeUFsYXJtc0FuZFJ1bGVzJztcbmltcG9ydCB7IElCYXNlT3BlcmF0aW9uUmVnaW9uYWxBbGFybXNBbmRSdWxlcyB9IGZyb20gJy4vSUJhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzJztcbmltcG9ydCB7IEJhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzUHJvcHMgfSBmcm9tICcuL3Byb3BzL0Jhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzUHJvcHMnO1xuXG4vKipcbiAqIEJhc2Ugb3BlcmF0aW9uIHJlZ2lvbmFsIGFsYXJtcyBhbmQgcnVsZXNcbiAqL1xuZXhwb3J0IGFic3RyYWN0IGNsYXNzIEJhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzXG4gIGV4dGVuZHMgQ29uc3RydWN0XG4gIGltcGxlbWVudHMgSUJhc2VPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzIHtcbiAgLyoqXG4gICAqIEF2YWlsYWJpbGl0eSBhbGFybSBmb3IgdGhpcyBvcGVyYXRpb25cbiAgICovXG4gIGF2YWlsYWJpbGl0eUFsYXJtOiBJQWxhcm07XG5cbiAgLyoqXG4gICAqIExhdGVuY3kgYWxhcm0gZm9yIHRoaXMgb3BlcmF0aW9uXG4gICAqL1xuICBsYXRlbmN5QWxhcm06IElBbGFybTtcblxuICAvKipcbiAgICogQ29tcG9zaXRlIGFsYXJtIGZvciBlaXRoZXIgYXZhaWxhYmlsdGl5IG9yIGxhdGVuY3kgaW1wYWN0IHRvIHRoaXMgb3BlcmF0aW9uXG4gICAqL1xuICBhdmFpbGFiaWxpdHlPckxhdGVuY3lBbGFybTogSUFsYXJtO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIHNjb3BlOiBDb25zdHJ1Y3QsXG4gICAgaWQ6IHN0cmluZyxcbiAgICBwcm9wczogQmFzZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXNQcm9wcyxcbiAgKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIHRoaXMuYXZhaWxhYmlsaXR5QWxhcm0gPVxuICAgICAgQXZhaWxhYmlsaXR5QW5kTGF0ZW5jeUFsYXJtc0FuZFJ1bGVzLmNyZWF0ZVJlZ2lvbmFsQXZhaWxhYmlsaXR5QWxhcm0oXG4gICAgICAgIHRoaXMsXG4gICAgICAgIHByb3BzLmF2YWlsYWJpbGl0eU1ldHJpY0RldGFpbHMsXG4gICAgICAgIHByb3BzLm5hbWVTdWZmaXgsXG4gICAgICApO1xuICAgIHRoaXMubGF0ZW5jeUFsYXJtID1cbiAgICAgIEF2YWlsYWJpbGl0eUFuZExhdGVuY3lBbGFybXNBbmRSdWxlcy5jcmVhdGVSZWdpb25hbExhdGVuY3lBbGFybShcbiAgICAgICAgdGhpcyxcbiAgICAgICAgcHJvcHMubGF0ZW5jeU1ldHJpY0RldGFpbHMsXG4gICAgICAgIHByb3BzLm5hbWVTdWZmaXgsXG4gICAgICApO1xuICAgIHRoaXMuYXZhaWxhYmlsaXR5T3JMYXRlbmN5QWxhcm0gPVxuICAgICAgQXZhaWxhYmlsaXR5QW5kTGF0ZW5jeUFsYXJtc0FuZFJ1bGVzLmNyZWF0ZVJlZ2lvbmFsQXZhaWxhYmlsaXR5T3JMYXRlbmN5SW1wYWN0QWxhcm0oXG4gICAgICAgIHRoaXMsXG4gICAgICAgIHByb3BzLmF2YWlsYWJpbGl0eU1ldHJpY0RldGFpbHMub3BlcmF0aW9uTmFtZSxcbiAgICAgICAgcHJvcHMubmFtZVN1ZmZpeCxcbiAgICAgICAgdGhpcy5hdmFpbGFiaWxpdHlBbGFybSxcbiAgICAgICAgdGhpcy5sYXRlbmN5QWxhcm0sXG4gICAgICApO1xuICB9XG59XG4iXX0=

package/lib/alarmsandrules/BaseOperationZonalAlarmsAndRules.d.ts

@@ -1,23 +1,18 @@
-import { IAlarm } from 'aws-cdk-lib/aws-cloudwatch';
-import { Construct } from 'constructs';
-import { IBaseOperationZonalAlarmsAndRules } from './IBaseOperationZonalAlarmsAndRules';
-import { BaseOperationZonalAlarmsAndRulesProps } from './props/BaseOperationZonalAlarmsAndRulesProps';
+import { IAlarm } from "aws-cdk-lib/aws-cloudwatch";
+import { Construct } from "constructs";
+import { IBaseOperationZonalAlarmsAndRules } from "./IBaseOperationZonalAlarmsAndRules";
 /**
  * The base operation regional alarms and rules
  */
 export declare abstract class BaseOperationZonalAlarmsAndRules extends Construct implements IBaseOperationZonalAlarmsAndRules {
-    /**
-     * Composite alarm for either availabiltiy or latency impact to this operation
-     */
-    availabilityOrLatencyAlarm: IAlarm;
     /**
      * Availability alarm for this operation
      */
-    availabilityAlarm: IAlarm;
+    abstract availabilityAlarm: IAlarm;
     /**
      * Latency alarm for this operation
      */
-    latencyAlarm: IAlarm;
+    abstract latencyAlarm: IAlarm;
     /**
      * Alarm that indicates that this AZ is an outlier for fault rate
      */
@@ -26,9 +21,5 @@ export declare abstract class BaseOperationZonalAlarmsAndRules extends Construct
      * Alarm that indicates this AZ is an outlier for high latency
      */
     abstract availabilityZoneIsOutlierForLatency: IAlarm;
-    /**
-     * The Availability Zone Id for the alarms and rules
-     */
-    availabilityZoneId: string;
-    constructor(scope: Construct, id: string, props: BaseOperationZonalAlarmsAndRulesProps);
+    constructor(scope: Construct, id: string);
 }

package/lib/alarmsandrules/BaseOperationZonalAlarmsAndRules.js

@@ -2,21 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseOperationZonalAlarmsAndRules = void 0;
 const constructs_1 = require("constructs");
-const AvailabilityAndLatencyAlarmsAndRules_1 = require("./AvailabilityAndLatencyAlarmsAndRules");
 /**
  * The base operation regional alarms and rules
  */
 class BaseOperationZonalAlarmsAndRules extends constructs_1.Construct {
-    constructor(scope, id, props) {
+    constructor(scope, id) {
         super(scope, id);
-        this.availabilityZoneId = props.availabilityZoneId;
-        this.availabilityAlarm =
-            AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalAvailabilityAlarm(this, props.availabilityMetricDetails, props.availabilityZoneId, props.counter, props.nameSuffix);
-        this.latencyAlarm =
-            AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalLatencyAlarm(this, props.latencyMetricDetails, props.availabilityZoneId, props.counter, props.nameSuffix);
-        this.availabilityOrLatencyAlarm =
-            AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalAvailabilityOrLatencyCompositeAlarm(this, props.availabilityMetricDetails.operationName, props.availabilityZoneId, props.counter, this.availabilityAlarm, this.latencyAlarm, props.nameSuffix);
     }
 }
 exports.BaseOperationZonalAlarmsAndRules = BaseOperationZonalAlarmsAndRules;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWxhcm1zYW5kcnVsZXMvQmFzZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EsMkNBQXVDO0FBQ3ZDLGlHQUE4RjtBQUk5Rjs7R0FFRztBQUNILE1BQXNCLGdDQUNwQixTQUFRLHNCQUFTO0lBZ0NqQixZQUNFLEtBQWdCLEVBQ2hCLEVBQVUsRUFDVixLQUE0QztRQUU1QyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2pCLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxLQUFLLENBQUMsa0JBQWtCLENBQUM7UUFDbkQsSUFBSSxDQUFDLGlCQUFpQjtZQUNwQiwyRUFBb0MsQ0FBQyw0QkFBNEIsQ0FDL0QsSUFBSSxFQUNKLEtBQUssQ0FBQyx5QkFBeUIsRUFDL0IsS0FBSyxDQUFDLGtCQUFrQixFQUN4QixLQUFLLENBQUMsT0FBTyxFQUNiLEtBQUssQ0FBQyxVQUFVLENBQ2pCLENBQUM7UUFDSixJQUFJLENBQUMsWUFBWTtZQUNmLDJFQUFvQyxDQUFDLHVCQUF1QixDQUMxRCxJQUFJLEVBQ0osS0FBSyxDQUFDLG9CQUFvQixFQUMxQixLQUFLLENBQUMsa0JBQWtCLEVBQ3hCLEtBQUssQ0FBQyxPQUFPLEVBQ2IsS0FBSyxDQUFDLFVBQVUsQ0FDakIsQ0FBQztRQUNKLElBQUksQ0FBQywwQkFBMEI7WUFDN0IsMkVBQW9DLENBQUMsOENBQThDLENBQ2pGLElBQUksRUFDSixLQUFLLENBQUMseUJBQXlCLENBQUMsYUFBYSxFQUM3QyxLQUFLLENBQUMsa0JBQWtCLEVBQ3hCLEtBQUssQ0FBQyxPQUFPLEVBQ2IsSUFBSSxDQUFDLGlCQUFpQixFQUN0QixJQUFJLENBQUMsWUFBWSxFQUNqQixLQUFLLENBQUMsVUFBVSxDQUNqQixDQUFDO0lBQ04sQ0FBQztDQUNGO0FBbkVELDRFQW1FQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIENvcHlyaWdodCBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuLy8gU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEFwYWNoZS0yLjBcbmltcG9ydCB7IElBbGFybSB9IGZyb20gJ2F3cy1jZGstbGliL2F3cy1jbG91ZHdhdGNoJztcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuaW1wb3J0IHsgQXZhaWxhYmlsaXR5QW5kTGF0ZW5jeUFsYXJtc0FuZFJ1bGVzIH0gZnJvbSAnLi9BdmFpbGFiaWxpdHlBbmRMYXRlbmN5QWxhcm1zQW5kUnVsZXMnO1xuaW1wb3J0IHsgSUJhc2VPcGVyYXRpb25ab25hbEFsYXJtc0FuZFJ1bGVzIH0gZnJvbSAnLi9JQmFzZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXMnO1xuaW1wb3J0IHsgQmFzZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXNQcm9wcyB9IGZyb20gJy4vcHJvcHMvQmFzZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXNQcm9wcyc7XG5cbi8qKlxuICogVGhlIGJhc2Ugb3BlcmF0aW9uIHJlZ2lvbmFsIGFsYXJtcyBhbmQgcnVsZXNcbiAqL1xuZXhwb3J0IGFic3RyYWN0IGNsYXNzIEJhc2VPcGVyYXRpb25ab25hbEFsYXJtc0FuZFJ1bGVzXG4gIGV4dGVuZHMgQ29uc3RydWN0XG4gIGltcGxlbWVudHMgSUJhc2VPcGVyYXRpb25ab25hbEFsYXJtc0FuZFJ1bGVzIHtcbiAgLyoqXG4gICAqIENvbXBvc2l0ZSBhbGFybSBmb3IgZWl0aGVyIGF2YWlsYWJpbHRpeSBvciBsYXRlbmN5IGltcGFjdCB0byB0aGlzIG9wZXJhdGlvblxuICAgKi9cbiAgYXZhaWxhYmlsaXR5T3JMYXRlbmN5QWxhcm06IElBbGFybTtcblxuICAvKipcbiAgICogQXZhaWxhYmlsaXR5IGFsYXJtIGZvciB0aGlzIG9wZXJhdGlvblxuICAgKi9cbiAgYXZhaWxhYmlsaXR5QWxhcm06IElBbGFybTtcblxuICAvKipcbiAgICogTGF0ZW5jeSBhbGFybSBmb3IgdGhpcyBvcGVyYXRpb25cbiAgICovXG4gIGxhdGVuY3lBbGFybTogSUFsYXJtO1xuXG4gIC8qKlxuICAgKiBBbGFybSB0aGF0IGluZGljYXRlcyB0aGF0IHRoaXMgQVogaXMgYW4gb3V0bGllciBmb3IgZmF1bHQgcmF0ZVxuICAgKi9cbiAgYWJzdHJhY3QgYXZhaWxhYmlsaXR5Wm9uZUlzT3V0bGllckZvckZhdWx0czogSUFsYXJtO1xuXG4gIC8qKlxuICAgKiBBbGFybSB0aGF0IGluZGljYXRlcyB0aGlzIEFaIGlzIGFuIG91dGxpZXIgZm9yIGhpZ2ggbGF0ZW5jeVxuICAgKi9cbiAgYWJzdHJhY3QgYXZhaWxhYmlsaXR5Wm9uZUlzT3V0bGllckZvckxhdGVuY3k6IElBbGFybTtcblxuICAvKipcbiAgICogVGhlIEF2YWlsYWJpbGl0eSBab25lIElkIGZvciB0aGUgYWxhcm1zIGFuZCBydWxlc1xuICAgKi9cbiAgYXZhaWxhYmlsaXR5Wm9uZUlkOiBzdHJpbmc7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgc2NvcGU6IENvbnN0cnVjdCxcbiAgICBpZDogc3RyaW5nLFxuICAgIHByb3BzOiBCYXNlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlc1Byb3BzLFxuICApIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuICAgIHRoaXMuYXZhaWxhYmlsaXR5Wm9uZUlkID0gcHJvcHMuYXZhaWxhYmlsaXR5Wm9uZUlkO1xuICAgIHRoaXMuYXZhaWxhYmlsaXR5QWxhcm0gPVxuICAgICAgQXZhaWxhYmlsaXR5QW5kTGF0ZW5jeUFsYXJtc0FuZFJ1bGVzLmNyZWF0ZVpvbmFsQXZhaWxhYmlsaXR5QWxhcm0oXG4gICAgICAgIHRoaXMsXG4gICAgICAgIHByb3BzLmF2YWlsYWJpbGl0eU1ldHJpY0RldGFpbHMsXG4gICAgICAgIHByb3BzLmF2YWlsYWJpbGl0eVpvbmVJZCxcbiAgICAgICAgcHJvcHMuY291bnRlcixcbiAgICAgICAgcHJvcHMubmFtZVN1ZmZpeCxcbiAgICAgICk7XG4gICAgdGhpcy5sYXRlbmN5QWxhcm0gPVxuICAgICAgQXZhaWxhYmlsaXR5QW5kTGF0ZW5jeUFsYXJtc0FuZFJ1bGVzLmNyZWF0ZVpvbmFsTGF0ZW5jeUFsYXJtKFxuICAgICAgICB0aGlzLFxuICAgICAgICBwcm9wcy5sYXRlbmN5TWV0cmljRGV0YWlscyxcbiAgICAgICAgcHJvcHMuYXZhaWxhYmlsaXR5Wm9uZUlkLFxuICAgICAgICBwcm9wcy5jb3VudGVyLFxuICAgICAgICBwcm9wcy5uYW1lU3VmZml4LFxuICAgICAgKTtcbiAgICB0aGlzLmF2YWlsYWJpbGl0eU9yTGF0ZW5jeUFsYXJtID1cbiAgICAgIEF2YWlsYWJpbGl0eUFuZExhdGVuY3lBbGFybXNBbmRSdWxlcy5jcmVhdGVab25hbEF2YWlsYWJpbGl0eU9yTGF0ZW5jeUNvbXBvc2l0ZUFsYXJtKFxuICAgICAgICB0aGlzLFxuICAgICAgICBwcm9wcy5hdmFpbGFiaWxpdHlNZXRyaWNEZXRhaWxzLm9wZXJhdGlvbk5hbWUsXG4gICAgICAgIHByb3BzLmF2YWlsYWJpbGl0eVpvbmVJZCxcbiAgICAgICAgcHJvcHMuY291bnRlcixcbiAgICAgICAgdGhpcy5hdmFpbGFiaWxpdHlBbGFybSxcbiAgICAgICAgdGhpcy5sYXRlbmN5QWxhcm0sXG4gICAgICAgIHByb3BzLm5hbWVTdWZmaXgsXG4gICAgICApO1xuICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWxhcm1zYW5kcnVsZXMvQmFzZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EsMkNBQXVDO0FBR3ZDOztHQUVHO0FBQ0gsTUFBc0IsZ0NBQ3BCLFNBQVEsc0JBQVM7SUF1QmpCLFlBQ0UsS0FBZ0IsRUFDaEIsRUFBVTtRQUVWLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDbkIsQ0FBQztDQUNGO0FBOUJELDRFQThCQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIENvcHlyaWdodCBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuLy8gU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEFwYWNoZS0yLjBcbmltcG9ydCB7IElBbGFybSB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtY2xvdWR3YXRjaFwiO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7IElCYXNlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlcyB9IGZyb20gXCIuL0lCYXNlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlc1wiO1xuXG4vKipcbiAqIFRoZSBiYXNlIG9wZXJhdGlvbiByZWdpb25hbCBhbGFybXMgYW5kIHJ1bGVzXG4gKi9cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBCYXNlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlc1xuICBleHRlbmRzIENvbnN0cnVjdFxuICBpbXBsZW1lbnRzIElCYXNlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlc1xue1xuICAvKipcbiAgICogQXZhaWxhYmlsaXR5IGFsYXJtIGZvciB0aGlzIG9wZXJhdGlvblxuICAgKi9cbiAgYWJzdHJhY3QgYXZhaWxhYmlsaXR5QWxhcm06IElBbGFybTtcblxuICAvKipcbiAgICogTGF0ZW5jeSBhbGFybSBmb3IgdGhpcyBvcGVyYXRpb25cbiAgICovXG4gIGFic3RyYWN0IGxhdGVuY3lBbGFybTogSUFsYXJtO1xuXG4gIC8qKlxuICAgKiBBbGFybSB0aGF0IGluZGljYXRlcyB0aGF0IHRoaXMgQVogaXMgYW4gb3V0bGllciBmb3IgZmF1bHQgcmF0ZVxuICAgKi9cbiAgYWJzdHJhY3QgYXZhaWxhYmlsaXR5Wm9uZUlzT3V0bGllckZvckZhdWx0czogSUFsYXJtO1xuXG4gIC8qKlxuICAgKiBBbGFybSB0aGF0IGluZGljYXRlcyB0aGlzIEFaIGlzIGFuIG91dGxpZXIgZm9yIGhpZ2ggbGF0ZW5jeVxuICAgKi9cbiAgYWJzdHJhY3QgYXZhaWxhYmlsaXR5Wm9uZUlzT3V0bGllckZvckxhdGVuY3k6IElBbGFybTtcblxuICBjb25zdHJ1Y3RvcihcbiAgICBzY29wZTogQ29uc3RydWN0LFxuICAgIGlkOiBzdHJpbmdcbiAgKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcbiAgfVxufVxuIl19

package/lib/alarmsandrules/CanaryOperationZonalAlarmsAndRules.d.ts

@@ -7,18 +7,26 @@ import { CanaryOperationZonalAlarmsAndRulesProps } from './props/CanaryOperation
  * Creates the alarms and rules for a particular operation as measured by the canary
  */
 export declare class CanaryOperationZonalAlarmsAndRules extends BaseOperationZonalAlarmsAndRules implements ICanaryOperationZonalAlarmsAndRules {
+    /**
+     * Availability alarm for this operation
+     */
+    readonly availabilityAlarm: IAlarm;
+    /**
+     * Latency alarm for this operation
+     */
+    readonly latencyAlarm: IAlarm;
     /**
      * Alarm that triggers if either latency or availability breach the specified
      * threshold in this AZ and the AZ is an outlier for faults or latency
      */
-    isolatedImpactAlarm: IAlarm;
+    readonly isolatedImpactAlarm: IAlarm;
     /**
      * Alarm that indicates that this AZ is an outlier for fault rate
      */
-    availabilityZoneIsOutlierForFaults: IAlarm;
+    readonly availabilityZoneIsOutlierForFaults: IAlarm;
     /**
      * Alarm that indicates this AZ is an outlier for high latency
      */
-    availabilityZoneIsOutlierForLatency: IAlarm;
+    readonly availabilityZoneIsOutlierForLatency: IAlarm;
     constructor(scope: Construct, id: string, props: CanaryOperationZonalAlarmsAndRulesProps);
 }

package/lib/alarmsandrules/CanaryOperationZonalAlarmsAndRules.js

@@ -9,26 +9,37 @@ const OutlierDetectionAlgorithm_1 = require("../utilities/OutlierDetectionAlgori
  */
 class CanaryOperationZonalAlarmsAndRules extends BaseOperationZonalAlarmsAndRules_1.BaseOperationZonalAlarmsAndRules {
     constructor(scope, id, props) {
-        super(scope, id, props);
-        if (props.outlierDetectionAlgorithm == OutlierDetectionAlgorithm_1.OutlierDetectionAlgorithm.STATIC) {
+        super(scope, id);
+        let azLetter = props.availabilityZone.substring(props.availabilityZone.length - 1);
+        let availabilityZoneId = props.operationAlarmsAndRulesProps.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(azLetter);
+        let operation = props.operationAlarmsAndRulesProps.operation;
+        this.availabilityAlarm =
+            AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalAvailabilityAlarm(this, operation.canaryMetricDetails.canaryAvailabilityMetricDetails, props.availabilityZone, availabilityZoneId, props.counter, props.nameSuffix);
+        this.latencyAlarm =
+            AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalLatencyAlarm(this, operation.canaryMetricDetails.canaryLatencyMetricDetails, props.availabilityZone, availabilityZoneId, props.counter, props.nameSuffix);
+        if (props.operationAlarmsAndRulesProps.availabilityOutlierDetectionAlgorithm == OutlierDetectionAlgorithm_1.OutlierDetectionAlgorithm.STATIC) {
             this.availabilityZoneIsOutlierForFaults =
-                AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalFaultRateStaticOutlierAlarmForCanaries(this, props.availabilityMetricDetails, props.availabilityZoneId, props.operation.service.availabilityZoneNames, props.counter, props.outlierThreshold, props.nameSuffix);
-            this.availabilityZoneIsOutlierForLatency =
-                AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalHighLatencyStaticOutlierAlarmForCanaries(this, props.latencyMetricDetails, props.availabilityZoneId, props.operation.service.availabilityZoneNames, props.counter, props.outlierThreshold, props.nameSuffix);
+                AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalFaultRateStaticOutlierAlarmForCanaries(this, operation.canaryMetricDetails.canaryAvailabilityMetricDetails, props.availabilityZone, availabilityZoneId, operation.service.availabilityZoneNames, props.counter, props.operationAlarmsAndRulesProps.availabilityOutlierThreshold, props.nameSuffix);
         }
         else {
             this.availabilityZoneIsOutlierForFaults =
-                AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalFaultRateOutlierAlarm(this, props.availabilityMetricDetails, props.availabilityZoneId, props.operation.service.availabilityZoneNames.map((az) => {
-                    return props.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(az.substring(az.length - 1));
-                }), props.outlierThreshold, props.outlierDetectionFunction, props.outlierDetectionAlgorithm, props.counter, props.nameSuffix);
+                AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalFaultRateOutlierAlarm(this, operation.canaryMetricDetails.canaryAvailabilityMetricDetails, availabilityZoneId, operation.service.availabilityZoneNames.map((az) => {
+                    return props.operationAlarmsAndRulesProps.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(az.substring(az.length - 1));
+                }), props.operationAlarmsAndRulesProps.availabilityOutlierThreshold, props.operationAlarmsAndRulesProps.outlierDetectionFunction, props.operationAlarmsAndRulesProps.availabilityOutlierDetectionAlgorithm, props.counter, props.nameSuffix);
+        }
+        if (props.operationAlarmsAndRulesProps.latencyOutlierDetectionAlgorithm == OutlierDetectionAlgorithm_1.OutlierDetectionAlgorithm.STATIC) {
+            this.availabilityZoneIsOutlierForLatency =
+                AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalHighLatencyStaticOutlierAlarmForCanaries(this, operation.canaryMetricDetails.canaryLatencyMetricDetails, props.availabilityZone, availabilityZoneId, operation.service.availabilityZoneNames, props.counter, props.operationAlarmsAndRulesProps.latencyOutlierThreshold, props.nameSuffix);
+        }
+        else {
             this.availabilityZoneIsOutlierForLatency =
-                AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalHighLatencyOutlierAlarm(this, props.latencyMetricDetails, props.availabilityZoneId, props.operation.service.availabilityZoneNames.map((az) => {
-                    return props.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(az.substring(az.length - 1));
-                }), props.outlierThreshold, props.outlierDetectionFunction, props.outlierDetectionAlgorithm, props.counter, props.nameSuffix);
+                AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createZonalHighLatencyOutlierAlarm(this, operation.canaryMetricDetails.canaryLatencyMetricDetails, availabilityZoneId, operation.service.availabilityZoneNames.map((az) => {
+                    return props.operationAlarmsAndRulesProps.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(az.substring(az.length - 1));
+                }), props.operationAlarmsAndRulesProps.latencyOutlierThreshold, props.operationAlarmsAndRulesProps.outlierDetectionFunction, props.operationAlarmsAndRulesProps.latencyOutlierDetectionAlgorithm, props.counter, props.nameSuffix);
         }
         this.isolatedImpactAlarm =
-            AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createCanaryIsolatedAZImpactAlarm(this, props.availabilityMetricDetails.operationName, props.availabilityZoneId, props.counter, this.availabilityZoneIsOutlierForFaults, this.availabilityAlarm, this.availabilityZoneIsOutlierForLatency, this.latencyAlarm, props.nameSuffix);
+            AvailabilityAndLatencyAlarmsAndRules_1.AvailabilityAndLatencyAlarmsAndRules.createCanaryIsolatedAZImpactAlarm(this, operation.operationName, availabilityZoneId, props.counter, this.availabilityZoneIsOutlierForFaults, this.availabilityAlarm, this.availabilityZoneIsOutlierForLatency, this.latencyAlarm, props.nameSuffix);
     }
 }
 exports.CanaryOperationZonalAlarmsAndRules = CanaryOperationZonalAlarmsAndRules;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CanaryOperationZonalAlarmsAndRules.js","sourceRoot":"","sources":["../../src/alarmsandrules/CanaryOperationZonalAlarmsAndRules.ts"],"names":[],"mappings":";;;AAIA,iGAA8F;AAC9F,yFAAsF;AAGtF,sFAAmF;AAEnF;;GAEG;AACH,MAAa,kCACX,SAAQ,mEAAgC;IAkBxC,YACE,KAAgB,EAChB,EAAU,EACV,KAA8C;QAE9C,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAExB,IAAI,KAAK,CAAC,yBAAyB,IAAI,qDAAyB,CAAC,MAAM,EAAE,CAAC;YACxE,IAAI,CAAC,kCAAkC;gBACrC,2EAAoC,CAAC,iDAAiD,CACpF,IAAI,EACJ,KAAK,CAAC,yBAAyB,EAC/B,KAAK,CAAC,kBAAkB,EACxB,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,qBAAqB,EAC7C,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,UAAU,CACjB,CAAC;YACJ,IAAI,CAAC,mCAAmC;gBACtC,2EAAoC,CAAC,mDAAmD,CACtF,IAAI,EACJ,KAAK,CAAC,oBAAoB,EAC1B,KAAK,CAAC,kBAAkB,EACxB,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,qBAAqB,EAC7C,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,UAAU,CACjB,CAAC;QACN,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,kCAAkC;gBACrC,2EAAoC,CAAC,gCAAgC,CACnE,IAAI,EACJ,KAAK,CAAC,yBAAyB,EAC/B,KAAK,CAAC,kBAAkB,EACxB,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;oBACvD,OAAO,KAAK,CAAC,QAAQ,CAAC,4CAA4C,CAChE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAC5B,CAAC;gBACJ,CAAC,CAAC,EACF,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,wBAAyB,EAC/B,KAAK,CAAC,yBAAyB,EAC/B,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,UAAU,CACjB,CAAC;YACJ,IAAI,CAAC,mCAAmC;gBACtC,2EAAoC,CAAC,kCAAkC,CACrE,IAAI,EACJ,KAAK,CAAC,oBAAoB,EAC1B,KAAK,CAAC,kBAAkB,EACxB,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;oBACvD,OAAO,KAAK,CAAC,QAAQ,CAAC,4CAA4C,CAChE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAC5B,CAAC;gBACJ,CAAC,CAAC,EACF,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,wBAAyB,EAC/B,KAAK,CAAC,yBAAyB,EAC/B,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,UAAU,CACjB,CAAC;QACN,CAAC;QAED,IAAI,CAAC,mBAAmB;YACtB,2EAAoC,CAAC,iCAAiC,CACpE,IAAI,EACJ,KAAK,CAAC,yBAAyB,CAAC,aAAa,EAC7C,KAAK,CAAC,kBAAkB,EACxB,KAAK,CAAC,OAAO,EACb,IAAI,CAAC,kCAAkC,EACvC,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,mCAAmC,EACxC,IAAI,CAAC,YAAY,EACjB,KAAK,CAAC,UAAU,CACjB,CAAC;IACN,CAAC;CACF;AA/FD,gFA+FC","sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { IAlarm } from 'aws-cdk-lib/aws-cloudwatch';\nimport { Construct } from 'constructs';\nimport { AvailabilityAndLatencyAlarmsAndRules } from './AvailabilityAndLatencyAlarmsAndRules';\nimport { BaseOperationZonalAlarmsAndRules } from './BaseOperationZonalAlarmsAndRules';\nimport { ICanaryOperationZonalAlarmsAndRules } from './ICanaryOperationZonalAlarmsAndRules';\nimport { CanaryOperationZonalAlarmsAndRulesProps } from './props/CanaryOperationZonalAlarmsAndRulesProps';\nimport { OutlierDetectionAlgorithm } from '../utilities/OutlierDetectionAlgorithm';\n\n/**\n * Creates the alarms and rules for a particular operation as measured by the canary\n */\nexport class CanaryOperationZonalAlarmsAndRules\n  extends BaseOperationZonalAlarmsAndRules\n  implements ICanaryOperationZonalAlarmsAndRules {\n  /**\n   * Alarm that triggers if either latency or availability breach the specified\n   * threshold in this AZ and the AZ is an outlier for faults or latency\n   */\n  isolatedImpactAlarm: IAlarm;\n\n  /**\n   * Alarm that indicates that this AZ is an outlier for fault rate\n   */\n  availabilityZoneIsOutlierForFaults: IAlarm;\n\n  /**\n   * Alarm that indicates this AZ is an outlier for high latency\n   */\n  availabilityZoneIsOutlierForLatency: IAlarm;\n\n  constructor(\n    scope: Construct,\n    id: string,\n    props: CanaryOperationZonalAlarmsAndRulesProps,\n  ) {\n    super(scope, id, props);\n\n    if (props.outlierDetectionAlgorithm == OutlierDetectionAlgorithm.STATIC) {\n      this.availabilityZoneIsOutlierForFaults =\n        AvailabilityAndLatencyAlarmsAndRules.createZonalFaultRateStaticOutlierAlarmForCanaries(\n          this,\n          props.availabilityMetricDetails,\n          props.availabilityZoneId,\n          props.operation.service.availabilityZoneNames,\n          props.counter,\n          props.outlierThreshold,\n          props.nameSuffix,\n        );\n      this.availabilityZoneIsOutlierForLatency =\n        AvailabilityAndLatencyAlarmsAndRules.createZonalHighLatencyStaticOutlierAlarmForCanaries(\n          this,\n          props.latencyMetricDetails,\n          props.availabilityZoneId,\n          props.operation.service.availabilityZoneNames,\n          props.counter,\n          props.outlierThreshold,\n          props.nameSuffix,\n        );\n    } else {\n      this.availabilityZoneIsOutlierForFaults =\n        AvailabilityAndLatencyAlarmsAndRules.createZonalFaultRateOutlierAlarm(\n          this,\n          props.availabilityMetricDetails,\n          props.availabilityZoneId,\n          props.operation.service.availabilityZoneNames.map((az) => {\n            return props.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(\n              az.substring(az.length - 1),\n            );\n          }),\n          props.outlierThreshold,\n          props.outlierDetectionFunction!,\n          props.outlierDetectionAlgorithm,\n          props.counter,\n          props.nameSuffix,\n        );\n      this.availabilityZoneIsOutlierForLatency =\n        AvailabilityAndLatencyAlarmsAndRules.createZonalHighLatencyOutlierAlarm(\n          this,\n          props.latencyMetricDetails,\n          props.availabilityZoneId,\n          props.operation.service.availabilityZoneNames.map((az) => {\n            return props.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(\n              az.substring(az.length - 1),\n            );\n          }),\n          props.outlierThreshold,\n          props.outlierDetectionFunction!,\n          props.outlierDetectionAlgorithm,\n          props.counter,\n          props.nameSuffix,\n        );\n    }\n\n    this.isolatedImpactAlarm =\n      AvailabilityAndLatencyAlarmsAndRules.createCanaryIsolatedAZImpactAlarm(\n        this,\n        props.availabilityMetricDetails.operationName,\n        props.availabilityZoneId,\n        props.counter,\n        this.availabilityZoneIsOutlierForFaults,\n        this.availabilityAlarm,\n        this.availabilityZoneIsOutlierForLatency,\n        this.latencyAlarm,\n        props.nameSuffix,\n      );\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CanaryOperationZonalAlarmsAndRules.js","sourceRoot":"","sources":["../../src/alarmsandrules/CanaryOperationZonalAlarmsAndRules.ts"],"names":[],"mappings":";;;AAIA,iGAA8F;AAC9F,yFAAsF;AAGtF,sFAAmF;AAGnF;;GAEG;AACH,MAAa,kCACX,SAAQ,mEAAgC;IA6BxC,YACE,KAAgB,EAChB,EAAU,EACV,KAA8C;QAE9C,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEjB,IAAI,QAAQ,GAAW,KAAK,CAAC,gBAAgB,CAAC,SAAS,CACnD,KAAK,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CACpC,CAAC;QACF,IAAI,kBAAkB,GACpB,KAAK,CAAC,4BAA4B,CAAC,QAAQ,CAAC,4CAA4C,CAAC,QAAQ,CAAC,CAAC;QAErG,IAAI,SAAS,GAAe,KAAK,CAAC,4BAA4B,CAAC,SAAS,CAAC;QAEzE,IAAI,CAAC,iBAAiB;YACtB,2EAAoC,CAAC,4BAA4B,CAC/D,IAAI,EACJ,SAAS,CAAC,mBAAoB,CAAC,+BAA+B,EAC9D,KAAK,CAAC,gBAAgB,EACtB,kBAAkB,EAClB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,UAAU,CACjB,CAAC;QACJ,IAAI,CAAC,YAAY;YACf,2EAAoC,CAAC,uBAAuB,CAC1D,IAAI,EACJ,SAAS,CAAC,mBAAoB,CAAC,0BAA0B,EACzD,KAAK,CAAC,gBAAgB,EACtB,kBAAkB,EAClB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,UAAU,CACjB,CAAC;QAEF,IAAI,KAAK,CAAC,4BAA4B,CAAC,qCAAqC,IAAI,qDAAyB,CAAC,MAAM,EAAE,CAAC;YACjH,IAAI,CAAC,kCAAkC;gBACrC,2EAAoC,CAAC,iDAAiD,CACpF,IAAI,EACJ,SAAS,CAAC,mBAAoB,CAAC,+BAA+B,EAC9D,KAAK,CAAC,gBAAgB,EACtB,kBAAkB,EAClB,SAAS,CAAC,OAAO,CAAC,qBAAqB,EACvC,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,4BAA4B,CAAC,4BAA4B,EAC/D,KAAK,CAAC,UAAU,CACjB,CAAC;QACN,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,kCAAkC;gBACrC,2EAAoC,CAAC,gCAAgC,CACnE,IAAI,EACJ,SAAS,CAAC,mBAAoB,CAAC,+BAA+B,EAC9D,kBAAkB,EAClB,SAAS,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;oBACjD,OAAO,KAAK,CAAC,4BAA4B,CAAC,QAAQ,CAAC,4CAA4C,CAC7F,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAC5B,CAAC;gBACJ,CAAC,CAAC,EACF,KAAK,CAAC,4BAA4B,CAAC,4BAA4B,EAC/D,KAAK,CAAC,4BAA4B,CAAC,wBAAyB,EAC5D,KAAK,CAAC,4BAA4B,CAAC,qCAAqC,EACxE,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,UAAU,CACjB,CAAC;QACN,CAAC;QAED,IAAI,KAAK,CAAC,4BAA4B,CAAC,gCAAgC,IAAI,qDAAyB,CAAC,MAAM,EAAE,CAAC;YAC5G,IAAI,CAAC,mCAAmC;gBACtC,2EAAoC,CAAC,mDAAmD,CACtF,IAAI,EACJ,SAAS,CAAC,mBAAoB,CAAC,0BAA0B,EACzD,KAAK,CAAC,gBAAgB,EACtB,kBAAkB,EAClB,SAAS,CAAC,OAAO,CAAC,qBAAqB,EACvC,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,4BAA4B,CAAC,uBAAuB,EAC1D,KAAK,CAAC,UAAU,CACjB,CAAC;QACN,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,mCAAmC;gBACtC,2EAAoC,CAAC,kCAAkC,CACrE,IAAI,EACJ,SAAS,CAAC,mBAAoB,CAAC,0BAA0B,EACzD,kBAAkB,EAClB,SAAS,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;oBACjD,OAAO,KAAK,CAAC,4BAA4B,CAAC,QAAQ,CAAC,4CAA4C,CAC7F,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAC5B,CAAC;gBACJ,CAAC,CAAC,EACF,KAAK,CAAC,4BAA4B,CAAC,uBAAuB,EAC1D,KAAK,CAAC,4BAA4B,CAAC,wBAAyB,EAC5D,KAAK,CAAC,4BAA4B,CAAC,gCAAgC,EACnE,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,UAAU,CACjB,CAAC;QACN,CAAC;QAED,IAAI,CAAC,mBAAmB;YACtB,2EAAoC,CAAC,iCAAiC,CACpE,IAAI,EACJ,SAAS,CAAC,aAAa,EACvB,kBAAkB,EAClB,KAAK,CAAC,OAAO,EACb,IAAI,CAAC,kCAAkC,EACvC,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,mCAAmC,EACxC,IAAI,CAAC,YAAY,EACjB,KAAK,CAAC,UAAU,CACjB,CAAC;IACN,CAAC;CACF;AA3ID,gFA2IC","sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { IAlarm } from 'aws-cdk-lib/aws-cloudwatch';\nimport { Construct } from 'constructs';\nimport { AvailabilityAndLatencyAlarmsAndRules } from './AvailabilityAndLatencyAlarmsAndRules';\nimport { BaseOperationZonalAlarmsAndRules } from './BaseOperationZonalAlarmsAndRules';\nimport { ICanaryOperationZonalAlarmsAndRules } from './ICanaryOperationZonalAlarmsAndRules';\nimport { CanaryOperationZonalAlarmsAndRulesProps } from './props/CanaryOperationZonalAlarmsAndRulesProps';\nimport { OutlierDetectionAlgorithm } from '../utilities/OutlierDetectionAlgorithm';\nimport { IOperation } from '../services/IOperation';\n\n/**\n * Creates the alarms and rules for a particular operation as measured by the canary\n */\nexport class CanaryOperationZonalAlarmsAndRules\n  extends BaseOperationZonalAlarmsAndRules\n  implements ICanaryOperationZonalAlarmsAndRules {\n\n  /**\n   * Availability alarm for this operation\n   */\n  readonly availabilityAlarm: IAlarm;\n\n  /**\n   * Latency alarm for this operation\n   */\n  readonly latencyAlarm: IAlarm;\n\n  /**\n   * Alarm that triggers if either latency or availability breach the specified\n   * threshold in this AZ and the AZ is an outlier for faults or latency\n   */\n  readonly isolatedImpactAlarm: IAlarm;\n\n  /**\n   * Alarm that indicates that this AZ is an outlier for fault rate\n   */\n  readonly availabilityZoneIsOutlierForFaults: IAlarm;\n\n  /**\n   * Alarm that indicates this AZ is an outlier for high latency\n   */\n  readonly availabilityZoneIsOutlierForLatency: IAlarm;\n\n  constructor(\n    scope: Construct,\n    id: string,\n    props: CanaryOperationZonalAlarmsAndRulesProps,\n  ) {\n    super(scope, id);\n\n    let azLetter: string = props.availabilityZone.substring(\n        props.availabilityZone.length - 1,\n    );\n    let availabilityZoneId: string =\n      props.operationAlarmsAndRulesProps.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(azLetter);\n    \n    let operation: IOperation = props.operationAlarmsAndRulesProps.operation;\n\n    this.availabilityAlarm =\n    AvailabilityAndLatencyAlarmsAndRules.createZonalAvailabilityAlarm(\n      this,\n      operation.canaryMetricDetails!.canaryAvailabilityMetricDetails,\n      props.availabilityZone,\n      availabilityZoneId,\n      props.counter,\n      props.nameSuffix,\n    );\n  this.latencyAlarm =\n    AvailabilityAndLatencyAlarmsAndRules.createZonalLatencyAlarm(\n      this,\n      operation.canaryMetricDetails!.canaryLatencyMetricDetails,\n      props.availabilityZone,\n      availabilityZoneId,\n      props.counter,\n      props.nameSuffix,\n    );\n    \n    if (props.operationAlarmsAndRulesProps.availabilityOutlierDetectionAlgorithm == OutlierDetectionAlgorithm.STATIC) {\n      this.availabilityZoneIsOutlierForFaults =\n        AvailabilityAndLatencyAlarmsAndRules.createZonalFaultRateStaticOutlierAlarmForCanaries(\n          this,\n          operation.canaryMetricDetails!.canaryAvailabilityMetricDetails,\n          props.availabilityZone,\n          availabilityZoneId,\n          operation.service.availabilityZoneNames,\n          props.counter,\n          props.operationAlarmsAndRulesProps.availabilityOutlierThreshold,\n          props.nameSuffix,\n        );\n    } else {\n      this.availabilityZoneIsOutlierForFaults =\n        AvailabilityAndLatencyAlarmsAndRules.createZonalFaultRateOutlierAlarm(\n          this,\n          operation.canaryMetricDetails!.canaryAvailabilityMetricDetails,\n          availabilityZoneId,\n          operation.service.availabilityZoneNames.map((az) => {\n            return props.operationAlarmsAndRulesProps.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(\n              az.substring(az.length - 1),\n            );\n          }),\n          props.operationAlarmsAndRulesProps.availabilityOutlierThreshold,\n          props.operationAlarmsAndRulesProps.outlierDetectionFunction!,\n          props.operationAlarmsAndRulesProps.availabilityOutlierDetectionAlgorithm,\n          props.counter,\n          props.nameSuffix,\n        );  \n    }\n\n    if (props.operationAlarmsAndRulesProps.latencyOutlierDetectionAlgorithm == OutlierDetectionAlgorithm.STATIC) {\n      this.availabilityZoneIsOutlierForLatency =\n        AvailabilityAndLatencyAlarmsAndRules.createZonalHighLatencyStaticOutlierAlarmForCanaries(\n          this,\n          operation.canaryMetricDetails!.canaryLatencyMetricDetails,\n          props.availabilityZone,\n          availabilityZoneId,\n          operation.service.availabilityZoneNames,\n          props.counter,\n          props.operationAlarmsAndRulesProps.latencyOutlierThreshold,\n          props.nameSuffix,\n        );\n    } else {\n      this.availabilityZoneIsOutlierForLatency =\n        AvailabilityAndLatencyAlarmsAndRules.createZonalHighLatencyOutlierAlarm(\n          this,\n          operation.canaryMetricDetails!.canaryLatencyMetricDetails,\n          availabilityZoneId,\n          operation.service.availabilityZoneNames.map((az) => {\n            return props.operationAlarmsAndRulesProps.azMapper.availabilityZoneIdFromAvailabilityZoneLetter(\n              az.substring(az.length - 1),\n            );\n          }),\n          props.operationAlarmsAndRulesProps.latencyOutlierThreshold,\n          props.operationAlarmsAndRulesProps.outlierDetectionFunction!,\n          props.operationAlarmsAndRulesProps.latencyOutlierDetectionAlgorithm,\n          props.counter,\n          props.nameSuffix,\n        );\n    }\n\n    this.isolatedImpactAlarm =\n      AvailabilityAndLatencyAlarmsAndRules.createCanaryIsolatedAZImpactAlarm(\n        this,\n        operation.operationName,\n        availabilityZoneId,\n        props.counter,\n        this.availabilityZoneIsOutlierForFaults,\n        this.availabilityAlarm,\n        this.availabilityZoneIsOutlierForLatency,\n        this.latencyAlarm,\n        props.nameSuffix,\n      );\n  }\n}\n"]}

package/lib/alarmsandrules/IBaseOperationZonalAlarmsAndRules.d.ts

@@ -3,10 +3,6 @@ import { IAlarm } from 'aws-cdk-lib/aws-cloudwatch';
  * The base operation zonal alarms and rules
  */
 export interface IBaseOperationZonalAlarmsAndRules {
-    /**
-     * Composite alarm for either availabiltiy or latency impact to this operation
-     */
-    availabilityOrLatencyAlarm: IAlarm;
     /**
      * Availability alarm for this operation
      */
@@ -23,8 +19,4 @@ export interface IBaseOperationZonalAlarmsAndRules {
      * Alarm that indicates this AZ is an outlier for high latency
      */
     availabilityZoneIsOutlierForLatency: IAlarm;
-    /**
-     * The Availability Zone Id for the alarms and rules
-     */
-    availabilityZoneId: string;
 }

package/lib/alarmsandrules/IBaseOperationZonalAlarmsAndRules.js

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

package/lib/alarmsandrules/IOperationAlarmsAndRules.d.ts

@@ -11,45 +11,38 @@ export interface IOperationAlarmsAndRules {
     /**
      * The operation the alarms and rules are created for
      */
-    operation: IOperation;
+    readonly operation: IOperation;
     /**
-     * The server side regional alarms and rules
-     */
-    serverSideRegionalAlarmsAndRules: IServerSideOperationRegionalAlarmsAndRules;
-    /**
-     * The canary regional alarms and rules
-     */
-    canaryRegionalAlarmsAndRules?: ICanaryOperationRegionalAlarmsAndRules;
-    /**
-     * The aggregate regional alarm that looks at both canary and server
-     * side impact alarms for latency and availability
+     * 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
      */
-    aggregateRegionalAlarm: IAlarm;
+    readonly regionalImpactAlarm: IAlarm;
     /**
-     * The server side zonal alarms and rules
+     * The server side regional alarms and rules
      */
-    serverSideZonalAlarmsAndRules: IServerSideOperationZonalAlarmsAndRules[];
+    readonly serverSideRegionalAlarmsAndRules: IServerSideOperationRegionalAlarmsAndRules;
     /**
-     * The canary zonal alarms and rules
+     * The canary regional alarms and rules
      */
-    canaryZonalAlarmsAndRules?: ICanaryOperationZonalAlarmsAndRules[];
+    readonly canaryRegionalAlarmsAndRules?: ICanaryOperationRegionalAlarmsAndRules;
     /**
-     * The aggregate zonal alarms, one per AZ. Each alarm indicates there is either
-     * latency or availability impact in that AZ, and the AZ is an outlier for
-     * availability or latency impact. Both server side and canary metrics are
-     * evaluated
+     * The aggregate, server-side and canary combined, zonal alarm indexed by Availability Zone name.
      */
-    aggregateZonalAlarms: IAlarm[];
+    readonly aggregateZonalAlarms: {
+        [key: string]: IAlarm;
+    };
     /**
-     * The aggregate zonal alarm indexed by Availability Zone Id.
+     * The server side zonal alarms and rules, indexed by Availability Zone name.
      */
-    aggregateZonalAlarmsMap: {
-        [key: string]: IAlarm;
+    readonly serverSideZonalAlarmsAndRules: {
+        [key: string]: IServerSideOperationZonalAlarmsAndRules;
     };
     /**
-     * Just the server side zonal alarms
+     * The canary zonal alarms and rules, indexed by Availability Zone name.
+     *
+     * @default - This is an empty dictionary if canary metric details are not provided
      */
-    serverSideZonalAlarmsMap: {
-        [key: string]: IAlarm;
+    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSU9wZXJhdGlvbkFsYXJtc0FuZFJ1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FsYXJtc2FuZHJ1bGVzL0lPcGVyYXRpb25BbGFybXNBbmRSdWxlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4vLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuaW1wb3J0IHsgSUFsYXJtIH0gZnJvbSAnYXdzLWNkay1saWIvYXdzLWNsb3Vkd2F0Y2gnO1xuaW1wb3J0IHsgSUNhbmFyeU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lDYW5hcnlPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzJztcbmltcG9ydCB7IElDYW5hcnlPcGVyYXRpb25ab25hbEFsYXJtc0FuZFJ1bGVzIH0gZnJvbSAnLi9JQ2FuYXJ5T3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJU2VydmVyU2lkZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lTZXJ2ZXJTaWRlT3BlcmF0aW9uUmVnaW9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJU2VydmVyU2lkZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lTZXJ2ZXJTaWRlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJT3BlcmF0aW9uIH0gZnJvbSAnLi4vc2VydmljZXMvSU9wZXJhdGlvbic7XG5cbi8qKlxuICogQ3JlYXRlcyBhbGFybXMgYW5kIHJ1bGVzIGZvciBhbiBvcGVyYXRpb24gZm9yIGJvdGggcmVnaW9uYWwgYW5kIHpvbmFsIG1ldHJpY3NcbiAqL1xuZXhwb3J0IGludGVyZmFjZSBJT3BlcmF0aW9uQWxhcm1zQW5kUnVsZXMge1xuICAvKipcbiAgICogVGhlIG9wZXJhdGlvbiB0aGUgYWxhcm1zIGFuZCBydWxlcyBhcmUgY3JlYXRlZCBmb3JcbiAgICovXG4gIG9wZXJhdGlvbjogSU9wZXJhdGlvbjtcblxuICAvKipcbiAgICogVGhlIHNlcnZlciBzaWRlIHJlZ2lvbmFsIGFsYXJtcyBhbmQgcnVsZXNcbiAgICovXG4gIHNlcnZlclNpZGVSZWdpb25hbEFsYXJtc0FuZFJ1bGVzOiBJU2VydmVyU2lkZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXM7XG5cbiAgLyoqXG4gICAqIFRoZSBjYW5hcnkgcmVnaW9uYWwgYWxhcm1zIGFuZCBydWxlc1xuICAgKi9cbiAgY2FuYXJ5UmVnaW9uYWxBbGFybXNBbmRSdWxlcz86IElDYW5hcnlPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzO1xuXG4gIC8qKlxuICAgKiBUaGUgYWdncmVnYXRlIHJlZ2lvbmFsIGFsYXJtIHRoYXQgbG9va3MgYXQgYm90aCBjYW5hcnkgYW5kIHNlcnZlclxuICAgKiBzaWRlIGltcGFjdCBhbGFybXMgZm9yIGxhdGVuY3kgYW5kIGF2YWlsYWJpbGl0eVxuICAgKi9cbiAgYWdncmVnYXRlUmVnaW9uYWxBbGFybTogSUFsYXJtO1xuXG4gIC8qKlxuICAgKiBUaGUgc2VydmVyIHNpZGUgem9uYWwgYWxhcm1zIGFuZCBydWxlc1xuICAgKi9cbiAgc2VydmVyU2lkZVpvbmFsQWxhcm1zQW5kUnVsZXM6IElTZXJ2ZXJTaWRlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlc1tdO1xuXG4gIC8qKlxuICAgKiBUaGUgY2FuYXJ5IHpvbmFsIGFsYXJtcyBhbmQgcnVsZXNcbiAgICovXG4gIGNhbmFyeVpvbmFsQWxhcm1zQW5kUnVsZXM/OiBJQ2FuYXJ5T3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlc1tdO1xuXG4gIC8qKlxuICAgKiBUaGUgYWdncmVnYXRlIHpvbmFsIGFsYXJtcywgb25lIHBlciBBWi4gRWFjaCBhbGFybSBpbmRpY2F0ZXMgdGhlcmUgaXMgZWl0aGVyXG4gICAqIGxhdGVuY3kgb3IgYXZhaWxhYmlsaXR5IGltcGFjdCBpbiB0aGF0IEFaLCBhbmQgdGhlIEFaIGlzIGFuIG91dGxpZXIgZm9yXG4gICAqIGF2YWlsYWJpbGl0eSBvciBsYXRlbmN5IGltcGFjdC4gQm90aCBzZXJ2ZXIgc2lkZSBhbmQgY2FuYXJ5IG1ldHJpY3MgYXJlXG4gICAqIGV2YWx1YXRlZFxuICAgKi9cbiAgYWdncmVnYXRlWm9uYWxBbGFybXM6IElBbGFybVtdO1xuXG4gIC8qKlxuICAgKiBUaGUgYWdncmVnYXRlIHpvbmFsIGFsYXJtIGluZGV4ZWQgYnkgQXZhaWxhYmlsaXR5IFpvbmUgSWQuXG4gICAqL1xuICBhZ2dyZWdhdGVab25hbEFsYXJtc01hcDogeyBba2V5OiBzdHJpbmddOiBJQWxhcm0gfTtcblxuICAvKipcbiAgICogSnVzdCB0aGUgc2VydmVyIHNpZGUgem9uYWwgYWxhcm1zXG4gICAqL1xuICBzZXJ2ZXJTaWRlWm9uYWxBbGFybXNNYXA6IHsgW2tleTogc3RyaW5nXTogSUFsYXJtIH07XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSU9wZXJhdGlvbkFsYXJtc0FuZFJ1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FsYXJtc2FuZHJ1bGVzL0lPcGVyYXRpb25BbGFybXNBbmRSdWxlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4vLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuaW1wb3J0IHsgSUFsYXJtIH0gZnJvbSAnYXdzLWNkay1saWIvYXdzLWNsb3Vkd2F0Y2gnO1xuaW1wb3J0IHsgSUNhbmFyeU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lDYW5hcnlPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzJztcbmltcG9ydCB7IElDYW5hcnlPcGVyYXRpb25ab25hbEFsYXJtc0FuZFJ1bGVzIH0gZnJvbSAnLi9JQ2FuYXJ5T3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJU2VydmVyU2lkZU9wZXJhdGlvblJlZ2lvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lTZXJ2ZXJTaWRlT3BlcmF0aW9uUmVnaW9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJU2VydmVyU2lkZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXMgfSBmcm9tICcuL0lTZXJ2ZXJTaWRlT3BlcmF0aW9uWm9uYWxBbGFybXNBbmRSdWxlcyc7XG5pbXBvcnQgeyBJT3BlcmF0aW9uIH0gZnJvbSAnLi4vc2VydmljZXMvSU9wZXJhdGlvbic7XG5cbi8qKlxuICogQ3JlYXRlcyBhbGFybXMgYW5kIHJ1bGVzIGZvciBhbiBvcGVyYXRpb24gZm9yIGJvdGggcmVnaW9uYWwgYW5kIHpvbmFsIG1ldHJpY3NcbiAqL1xuZXhwb3J0IGludGVyZmFjZSBJT3BlcmF0aW9uQWxhcm1zQW5kUnVsZXMge1xuICAvKipcbiAgICogVGhlIG9wZXJhdGlvbiB0aGUgYWxhcm1zIGFuZCBydWxlcyBhcmUgY3JlYXRlZCBmb3JcbiAgICovXG4gIHJlYWRvbmx5IG9wZXJhdGlvbjogSU9wZXJhdGlvbjtcblxuICAvKipcbiAgICogQW4gYWxhcm0gaW5kaWNhdGluZyBhdmFpbGFiaWxpdHkgb3IgbGF0ZW5jeSBpbXBhY3QgaGFzIGJlZW4gZGV0ZWN0ZWQgYnkgdGhlIHNlcnZlci1zaWRlIFxuICAgKiBhbmQvb3IgY2FuYXJ5IChpZiBwcmVzZW50KSBhbmQgdGhlIGltcGFjdCBpcyByZWdpb25hbGx5IHNjb3BlZCwgbm90IHpvbmFsXG4gICAqL1xuICByZWFkb25seSByZWdpb25hbEltcGFjdEFsYXJtOiBJQWxhcm07XG5cbiAgLyoqXG4gICAqIFRoZSBzZXJ2ZXIgc2lkZSByZWdpb25hbCBhbGFybXMgYW5kIHJ1bGVzXG4gICAqL1xuICByZWFkb25seSBzZXJ2ZXJTaWRlUmVnaW9uYWxBbGFybXNBbmRSdWxlczogSVNlcnZlclNpZGVPcGVyYXRpb25SZWdpb25hbEFsYXJtc0FuZFJ1bGVzO1xuXG4gIC8qKlxuICAgKiBUaGUgY2FuYXJ5IHJlZ2lvbmFsIGFsYXJtcyBhbmQgcnVsZXNcbiAgICovXG4gIHJlYWRvbmx5IGNhbmFyeVJlZ2lvbmFsQWxhcm1zQW5kUnVsZXM/OiBJQ2FuYXJ5T3BlcmF0aW9uUmVnaW9uYWxBbGFybXNBbmRSdWxlcztcblxuICAvKipcbiAgICogVGhlIGFnZ3JlZ2F0ZSwgc2VydmVyLXNpZGUgYW5kIGNhbmFyeSBjb21iaW5lZCwgem9uYWwgYWxhcm0gaW5kZXhlZCBieSBBdmFpbGFiaWxpdHkgWm9uZSBuYW1lLlxuICAgKi9cbiAgcmVhZG9ubHkgYWdncmVnYXRlWm9uYWxBbGFybXM6IHtba2V5OiBzdHJpbmddOiBJQWxhcm19O1xuXG4gIC8qKlxuICAgKiBUaGUgc2VydmVyIHNpZGUgem9uYWwgYWxhcm1zIGFuZCBydWxlcywgaW5kZXhlZCBieSBBdmFpbGFiaWxpdHkgWm9uZSBuYW1lLlxuICAgKi9cbiAgcmVhZG9ubHkgc2VydmVyU2lkZVpvbmFsQWxhcm1zQW5kUnVsZXM6IHtba2V5OiBzdHJpbmddOiBJU2VydmVyU2lkZU9wZXJhdGlvblpvbmFsQWxhcm1zQW5kUnVsZXN9O1xuXG4gIC8qKlxuICAgKiBUaGUgY2FuYXJ5IHpvbmFsIGFsYXJtcyBhbmQgcnVsZXMsIGluZGV4ZWQgYnkgQXZhaWxhYmlsaXR5IFpvbmUgbmFtZS5cbiAgICogXG4gICAqIEBkZWZhdWx0IC0gVGhpcyBpcyBhbiBlbXB0eSBkaWN0aW9uYXJ5IGlmIGNhbmFyeSBtZXRyaWMgZGV0YWlscyBhcmUgbm90IHByb3ZpZGVkXG4gICAqL1xuICByZWFkb25seSBjYW5hcnlab25hbEFsYXJtc0FuZFJ1bGVzPzoge1trZXk6IHN0cmluZ106IElDYW5hcnlPcGVyYXRpb25ab25hbEFsYXJtc0FuZFJ1bGVzfTtcbn1cbiJdfQ==

package/lib/alarmsandrules/IServerSideOperationRegionalAlarmsAndRules.js

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

package/lib/alarmsandrules/IServiceAlarmsAndRules.d.ts

@@ -13,32 +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 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
      */
-    regionalAvailabilityOrLatencyServerSideAlarm: IAlarm;
+    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.
      */
-    regionalAvailabilityServerSideAlarm: IAlarm;
-    /**
-     * An alarm for fault count exceeding a regional threshold for all critical operations.
-     */
-    regionalFaultCountServerSideAlarm: IAlarm;
+    serviceImpactAlarm: IAlarm;
 }

package/lib/alarmsandrules/IServiceAlarmsAndRules.js

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

package/lib/alarmsandrules/OperationAlarmsAndRules.d.ts

@@ -24,36 +24,29 @@ export declare class OperationAlarmsAndRules extends Construct implements IOpera
      */
     readonly canaryRegionalAlarmsAndRules?: ICanaryOperationRegionalAlarmsAndRules;
     /**
-     * The aggregate regional alarm that looks at both canary and server
-     * side impact alarms for latency and availability
-     */
-    readonly aggregateRegionalAlarm: IAlarm;
-    /**
-     * The server side zonal alarms and rules
-     */
-    readonly serverSideZonalAlarmsAndRules: IServerSideOperationZonalAlarmsAndRules[];
-    /**
-     * The canary zonal alarms and rules
+     * The aggregate zonal alarm indexed by Availability Zone Id.
      */
-    readonly canaryZonalAlarmsAndRules?: ICanaryOperationZonalAlarmsAndRules[];
+    readonly aggregateZonalAlarms: {
+        [key: string]: IAlarm;
+    };
     /**
-     * The aggregate zonal alarms, one per AZ. Each alarm indicates there is either
-     * latency or availability impact in that AZ, and the AZ is an outlier for
-     * availability or latency impact. Both server side and canary metrics are
-     * evaluated
+     * 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 aggregateZonalAlarms: IAlarm[];
+    readonly regionalImpactAlarm: IAlarm;
     /**
-     * The aggregate zonal alarm indexed by Availability Zone Id.
+     * The server side zonal alarms and rules, indexed by Availability Zone name.
      */
-    readonly aggregateZonalAlarmsMap: {
-        [key: string]: IAlarm;
+    readonly serverSideZonalAlarmsAndRules: {
+        [key: string]: IServerSideOperationZonalAlarmsAndRules;
     };
     /**
-     * Just the server side zonal alarms
+     * The canary zonal alarms and rules, indexed by Availability Zone name.
+     *
+     * @default - This is an empty dictionary if canary metric details are not provided
      */
-    readonly serverSideZonalAlarmsMap: {
-        [key: string]: IAlarm;
+    readonly canaryZonalAlarmsAndRules?: {
+        [key: string]: ICanaryOperationZonalAlarmsAndRules;
     };
     constructor(scope: Construct, id: string, props: OperationAlarmsAndRulesProps);
 }