Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

163 changes: 163 additions & 0 deletions packages/cdkConstructs/src/constructs/SnsAlarm.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
import {Duration} from "aws-cdk-lib"
import {Construct} from "constructs"
import {
Alarm,
ComparisonOperator,
CreateAlarmOptions,
Metric,
MetricStatConfig,
TreatMissingData,
Unit
} from "aws-cdk-lib/aws-cloudwatch"
import {SnsAction} from "aws-cdk-lib/aws-cloudwatch-actions"
import {ITopic} from "aws-cdk-lib/aws-sns"

/**
* Alarm definition for SnsAlarm with defaults applied by the construct.
*/
export interface SnsAlarmDefinition
extends Omit<CreateAlarmOptions, "threshold" | "evaluationPeriods"> {
/**
* The value against which the specified statistic is compared.
Comment thread
tstephen-nhs marked this conversation as resolved.
*
* @default 1
*/
readonly threshold?: number

/**
* The number of periods over which data is compared to the specified threshold.
*
* @default 1
*/
readonly evaluationPeriods?: number
}

/**
* Metric stat configuration for SnsAlarm with defaults applied by the construct.
*/
export interface SnsMetricStatConfig extends Omit<MetricStatConfig, "period" | "statistic"> {
/**
* How many seconds to aggregate over.
*
* @default Duration.minutes(1)
*/
readonly period?: Duration

/**
* Aggregation function to use.
*
* @default "Sum"
*/
readonly statistic?: string
}

const toDimensionsMap = (
dimensions: MetricStatConfig["dimensions"]
): {[dimensionName: string]: string} | undefined => {
if (!dimensions || dimensions.length === 0) {
return undefined
}

const dimensionMap: {[dimensionName: string]: string} = {}
dimensions.forEach((dimension) => {
dimensionMap[dimension.name] = String(dimension.value)
})
return dimensionMap
}

/**
* Constructs a concrete CloudWatch Metric from a MetricStatConfig.
* @see {@link import("aws-cdk-lib/aws-cloudwatch").MetricConfig} for alternate concrete metric configs.
*/
export const metricFromStatConfig = (
metricStatConfig: MetricStatConfig
): Metric =>
new Metric({
namespace: metricStatConfig.namespace,
metricName: metricStatConfig.metricName,
dimensionsMap: toDimensionsMap(metricStatConfig.dimensions),
statistic: metricStatConfig.statistic,
period: metricStatConfig.period,
unit: metricStatConfig.unitFilter,
account: metricStatConfig.accountOverride ?? metricStatConfig.account,
region: metricStatConfig.regionOverride ?? metricStatConfig.region
})

/**
* Configuration for creating a CloudWatch metric alarm with SNS publication construct.
*/
export interface SnsAlarmProps {

/** Prefix used in the generated CloudWatch alarm name. */
readonly stackName: string
/** Enables alarm actions when true, disabling notifications when false. */
readonly enableAlerts: boolean
/** CloudWatch metric and threshold settings for the alarm. */
readonly alarmDefinition: SnsAlarmDefinition
/** Defines the metric configuration to be monitored by the alarm. */
readonly metricStatConfig: SnsMetricStatConfig
/** SNS topic that receives alarm, OK, and insufficient data notifications. Common example is for Slack alerts. */
readonly snsTopic: ITopic
}
Comment thread
tstephen-nhs marked this conversation as resolved.

/**
* Creates a single CloudWatch alarm and wires all alarm state changes to an SNS topic.
*/
export class SnsAlarm extends Construct {
Comment thread
tstephen-nhs marked this conversation as resolved.
public readonly alarm: Alarm

/**
* Creates a CloudWatch alarm and publishes alarm state changes to the provided SNS topic.
*
* @param props Alarm configuration including metric settings, threshold settings, and notification topic.
* @example
* new SnsAlarm(this, 'MyApiErrorAlarm', {
* stackName: 'pfp-prod',
* enableAlerts: true,
* alarmDefinition: {
* alarmDescription: 'API errors detected',
* threshold: 1
* },
* metricStatConfig: {
* namespace: 'LambdaLogFilterMetrics',
* metricName: 'ErrorCount'
* },
* snsTopic: slackAlertTopic
* })
*/
public constructor(scope: Construct, id: string, props: SnsAlarmProps) {
super(scope, id)

const generatedAlarmName = props.alarmDefinition.alarmName ?? id
const {
threshold,
evaluationPeriods,
comparisonOperator,
treatMissingData,
...supportedAlarmDefinitionProps
} = props.alarmDefinition

const alarm = new Alarm(this, `${generatedAlarmName}Alarm`, {
...supportedAlarmDefinitionProps,
alarmName: `${props.stackName}-${generatedAlarmName}`,
metric: metricFromStatConfig({
...props.metricStatConfig,
unitFilter: props.metricStatConfig.unitFilter ?? Unit.COUNT,
statistic: props.metricStatConfig.statistic ?? "Sum",
period: props.metricStatConfig.period ?? Duration.minutes(1)
}),
threshold: threshold ?? 1,
evaluationPeriods: evaluationPeriods ?? 1,
comparisonOperator: comparisonOperator ?? ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,
treatMissingData: treatMissingData ?? TreatMissingData.NOT_BREACHING,
actionsEnabled: props.enableAlerts
})

const snsAction = new SnsAction(props.snsTopic)
alarm.addAlarmAction(snsAction)
alarm.addOkAction(snsAction)
alarm.addInsufficientDataAction(snsAction)

this.alarm = alarm
}
}
1 change: 1 addition & 0 deletions packages/cdkConstructs/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export * from "./constructs/RestApiGateway/accessLogFormat.js"
export * from "./constructs/RestApiGateway/LambdaEndpoint.js"
export * from "./constructs/RestApiGateway/StateMachineEndpoint.js"
export * from "./constructs/PythonLambdaFunction.js"
export * from "./constructs/SnsAlarm.js"
export * from "./constructs/SsmParametersConstruct.js"
export * from "./apps/createApp.js"
export * from "./config/index.js"
Expand Down
111 changes: 111 additions & 0 deletions packages/cdkConstructs/tests/constructs/SnsAlarm.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
import {App, Duration, Stack} from "aws-cdk-lib"
import {Template} from "aws-cdk-lib/assertions"
import {ComparisonOperator, Unit} from "aws-cdk-lib/aws-cloudwatch"
import {Topic} from "aws-cdk-lib/aws-sns"
import {describe, expect, it} from "vitest"
import {SnsAlarm} from "../../src/constructs/SnsAlarm"

const importedSlackTopicArn = "arn:aws:sns:eu-west-2:111111111111:SlackAlertsTopic"

describe("SnsAlarm construct", () => {
it("applies sane defaults for simple alarm definitions", () => {
const app = new App()
const stack = new Stack(app, "TestStack")
const slackAlertTopic = Topic.fromTopicArn(stack, "SlackAlertsTopic", importedSlackTopicArn)

const metricAlarm = new SnsAlarm(stack, "SimpleMetricAlarm", {
stackName: "pfp-test-stack",
enableAlerts: true,
alarmDefinition: {
alarmName: "MySimpleAlarm",
alarmDescription: "An alarm for any breach (threshold 1) in a single period"
},
metricStatConfig: {
namespace: "LambdaLogFilterMetrics",
metricName: "ErrorCount"
},
snsTopic: slackAlertTopic
})

expect(metricAlarm.alarm).toBeDefined()

const template = Template.fromStack(stack)
template.resourceCountIs("AWS::SNS::Topic", 0)

template.hasResourceProperties("AWS::CloudWatch::Alarm", {
AlarmName: "pfp-test-stack-MySimpleAlarm",
Namespace: "LambdaLogFilterMetrics",
MetricName: "ErrorCount",
Threshold: 1,
Comment thread
tstephen-nhs marked this conversation as resolved.
ComparisonOperator: "GreaterThanOrEqualToThreshold",
Unit: "Count",
Statistic: "Sum",
Period: 60,
EvaluationPeriods: 1,
TreatMissingData: "notBreaching",
AlarmDescription: "An alarm for any breach (threshold 1) in a single period",
AlarmActions: [importedSlackTopicArn],
OKActions: [importedSlackTopicArn],
InsufficientDataActions: [importedSlackTopicArn],
ActionsEnabled: true
})
})

it("allows overriding threshold, comparison operator, unit and dimensions", () => {
const app = new App()
const stack = new Stack(app, "OverrideStack")
const slackAlertTopic = Topic.fromTopicArn(stack, "SlackAlertsTopic", importedSlackTopicArn)

const metricAlarm = new SnsAlarm(stack, "OverrideMetricAlarm", {
stackName: "pfp-test-stack",
enableAlerts: false,
alarmDefinition: {
alarmName: "MyOverrideAlarm",
alarmDescription: "Override alarm",
threshold: 250,
comparisonOperator: ComparisonOperator.GREATER_THAN_THRESHOLD,
evaluationPeriods: 3,
datapointsToAlarm: 2
},
metricStatConfig: {
namespace: "CustomNamespace",
metricName: "Latency",
unitFilter: Unit.MILLISECONDS,
dimensions: [
{
name: "FunctionName",
value: "my-function"
}
],
period: Duration.minutes(1),
statistic: "Sum"
},
snsTopic: slackAlertTopic
})

expect(metricAlarm.alarm).toBeDefined()

const template = Template.fromStack(stack)

template.hasResourceProperties("AWS::CloudWatch::Alarm", {
AlarmName: "pfp-test-stack-MyOverrideAlarm",
Namespace: "CustomNamespace",
MetricName: "Latency",
Threshold: 250,
ComparisonOperator: "GreaterThanThreshold",
DatapointsToAlarm: 2,
Unit: "Milliseconds",
Dimensions: [
{
Name: "FunctionName",
Value: "my-function"
}
],
AlarmDescription: "Override alarm",
AlarmActions: [importedSlackTopicArn],
OKActions: [importedSlackTopicArn],
InsufficientDataActions: [importedSlackTopicArn],
ActionsEnabled: false
})
})
})