diff --git a/handlers/alarms-handler/src/alarmMappings.ts b/handlers/alarms-handler/src/alarmMappings.ts
index 411bd6d384..cd9d9e37be 100644
--- a/handlers/alarms-handler/src/alarmMappings.ts
+++ b/handlers/alarms-handler/src/alarmMappings.ts
@@ -1,3 +1,4 @@
+import { groupMap } from '@modules/arrayFunctions';
 import { getIfDefined } from '@modules/nullAndUndefined';
 
 type Team = 'VALUE' | 'GROWTH' | 'PORTFOLIO' | 'PLATFORM' | 'SRE';
@@ -107,33 +108,45 @@ const teamToAppMappings: Record<Team, string[]> = {
 	],
 };
 
-const buildAppToTeamMappings = (): Record<string, Team[]> => {
-	const mappings: Record<string, Team[]> = {};
+export class AlarmMappings {
+	constructor(mappings: Record<string, string[]> = teamToAppMappings) {
+		this.appToTeamMappings = this.buildAppToTeamMappings(mappings);
+	}
 
-	for (const [team, apps] of Object.entries(teamToAppMappings)) {
-		for (const app of apps) {
-			const teams = mappings[app] ?? [];
-			teams.push(team as Team);
+	private buildAppToTeamMappings = (
+		theMappings: Record<Team, string[]>,
+	): Record<string, Team[]> => {
+		const entries: Array<[Team, string[]]> = Object.entries(theMappings).map(
+			([team, apps]) => [team as Team, apps],
+		);
 
-			mappings[app] = teams;
-		}
-	}
-	return mappings;
-};
+		const teamToApp: Array<{ app: string; team: Team }> = entries.flatMap(
+			([team, apps]) => apps.map((app) => ({ team, app })),
+		);
 
-const appToTeamMappings: Record<string, Team[]> = buildAppToTeamMappings();
+		const mappings: Record<string, Team[]> = groupMap(
+			teamToApp,
+			({ app }) => app,
+			({ team }) => team,
+		);
 
-export const getTeams = (appName?: string): Team[] => {
-	if (appName && appToTeamMappings[appName]) {
-		return appToTeamMappings[appName] as Team[];
-	}
+		return mappings;
+	};
 
-	return ['SRE'];
-};
+	private appToTeamMappings: Record<string, Team[]>;
 
-export const getTeamWebhookUrl = (team: Team): string => {
-	return getIfDefined<string>(
-		process.env[`${team}_WEBHOOK`],
-		`${team}_WEBHOOK environment variable not set`,
-	);
-};
+	getTeams = (appName?: string): Team[] => {
+		if (appName && this.appToTeamMappings[appName]) {
+			return this.appToTeamMappings[appName] as Team[];
+		}
+
+		return ['SRE'];
+	};
+
+	getTeamWebhookUrl = (team: Team): string => {
+		return getIfDefined<string>(
+			process.env[`${team}_WEBHOOK`],
+			`${team}_WEBHOOK environment variable not set`,
+		);
+	};
+}
diff --git a/handlers/alarms-handler/src/cloudwatch.ts b/handlers/alarms-handler/src/cloudwatch.ts
index 0b585eb662..6571d1a4d8 100644
--- a/handlers/alarms-handler/src/cloudwatch.ts
+++ b/handlers/alarms-handler/src/cloudwatch.ts
@@ -49,10 +49,15 @@ const buildCloudwatchClient = (awsAccountId: string): CloudWatchClient => {
 	return new CloudWatchClient({ region: 'eu-west-1' });
 };
 
-const getTags = async (
+export type Tags = {
+	App?: string;
+	DiagnosticUrls?: string;
+};
+
+export const getTags = async (
 	alarmArn: string,
 	awsAccountId: string,
-): Promise<Tag[]> => {
+): Promise<Tags> => {
 	const client = buildCloudwatchClient(awsAccountId);
 
 	const request = new ListTagsForResourceCommand({
@@ -60,13 +65,9 @@ const getTags = async (
 	});
 
 	const response = await client.send(request);
-	return response.Tags ?? [];
-};
-
-export const getAppNameTag = async (
-	alarmArn: string,
-	awsAccountId: string,
-): Promise<string | undefined> => {
-	const tags = await getTags(alarmArn, awsAccountId);
-	return tags.find((tag: Tag) => tag.Key === 'App')?.Value;
+	const tags = response.Tags ?? [];
+	const entries = tags.flatMap((tag: Tag) =>
+		tag.Key && tag.Value ? [[tag.Key, tag.Value]] : [],
+	);
+	return Object.fromEntries(entries) as Tags;
 };
diff --git a/handlers/alarms-handler/src/index.ts b/handlers/alarms-handler/src/index.ts
index f2eeaa12d1..3b6d0ece40 100644
--- a/handlers/alarms-handler/src/index.ts
+++ b/handlers/alarms-handler/src/index.ts
@@ -1,7 +1,7 @@
-import type { SNSEventRecord, SQSEvent } from 'aws-lambda';
+import type { SNSEventRecord, SQSEvent, SQSRecord } from 'aws-lambda';
 import { z } from 'zod';
-import { getTeams, getTeamWebhookUrl } from './alarmMappings';
-import { getAppNameTag } from './cloudwatch';
+import { AlarmMappings } from './alarmMappings';
+import { getTags } from './cloudwatch';
 
 const cloudWatchAlarmMessageSchema = z.object({
 	AlarmArn: z.string(),
@@ -10,30 +10,33 @@ const cloudWatchAlarmMessageSchema = z.object({
 	NewStateReason: z.string(),
 	NewStateValue: z.string(),
 	AWSAccountId: z.string(),
+	StateChangeTime: z.coerce.date(),
+	Trigger: z
+		.object({
+			Period: z.number(),
+			EvaluationPeriods: z.number(),
+		})
+		.optional(),
 });
 
 type CloudWatchAlarmMessage = z.infer<typeof cloudWatchAlarmMessageSchema>;
 
 export const handler = async (event: SQSEvent): Promise<void> => {
 	try {
+		const alarmMappings = new AlarmMappings();
 		for (const record of event.Records) {
-			console.log(record);
-
-			const { Message, MessageAttributes } = JSON.parse(
-				record.body,
-			) as SNSEventRecord['Sns'];
-
-			const parsedMessage = attemptToParseMessageString({
-				messageString: Message,
-			});
-
-			if (parsedMessage) {
-				await handleCloudWatchAlarmMessage({ message: parsedMessage });
-			} else {
-				await handleSnsPublishMessage({
-					message: Message,
-					messageAttributes: MessageAttributes,
-				});
+			const maybeChatMessages = await getChatMessages(record, alarmMappings);
+
+			if (maybeChatMessages) {
+				await Promise.all(
+					maybeChatMessages.webhookUrls.map((webhookUrl) => {
+						return fetch(webhookUrl, {
+							method: 'POST',
+							headers: { 'Content-Type': 'application/json' },
+							body: JSON.stringify({ text: maybeChatMessages.text }),
+						});
+					}),
+				);
 			}
 		}
 	} catch (error) {
@@ -42,11 +45,38 @@ export const handler = async (event: SQSEvent): Promise<void> => {
 	}
 };
 
-const attemptToParseMessageString = ({
-	messageString,
-}: {
-	messageString: string;
-}): CloudWatchAlarmMessage | null => {
+export async function getChatMessages(
+	record: SQSRecord,
+	alarmMappings: AlarmMappings,
+) {
+	console.log('sqsRecord', record);
+
+	const snsEvent = JSON.parse(record.body) as SNSEventRecord['Sns'];
+
+	console.log('snsEvent', snsEvent);
+
+	const parsedMessage = attemptToParseMessageString(snsEvent.Message);
+
+	console.log('parsedMessage', parsedMessage);
+
+	const message = parsedMessage
+		? await getCloudWatchAlarmMessage(parsedMessage)
+		: getSnsPublishMessage({
+				message: snsEvent.Message,
+				messageAttributes: snsEvent.MessageAttributes,
+			});
+
+	if (message) {
+		const teams = alarmMappings.getTeams(message.app);
+		console.log('sending message to teams', teams);
+		const webhookUrls = teams.map(alarmMappings.getTeamWebhookUrl);
+		return { webhookUrls, text: message.text };
+	} else return undefined;
+}
+
+const attemptToParseMessageString = (
+	messageString: string,
+): CloudWatchAlarmMessage | null => {
 	try {
 		return cloudWatchAlarmMessageSchema.parse(JSON.parse(messageString));
 	} catch (error) {
@@ -54,47 +84,88 @@ const attemptToParseMessageString = ({
 	}
 };
 
-const handleCloudWatchAlarmMessage = async ({
-	message,
-}: {
-	message: CloudWatchAlarmMessage;
-}) => {
-	const {
-		AlarmArn,
-		AlarmName,
-		NewStateReason,
+async function getCloudWatchAlarmMessage({
+	AlarmArn,
+	AlarmName,
+	NewStateReason,
+	NewStateValue,
+	AlarmDescription,
+	AWSAccountId,
+	StateChangeTime,
+	Trigger,
+}: CloudWatchAlarmMessage) {
+	const tags = await getTags(AlarmArn, AWSAccountId);
+	console.log('tags', tags);
+	const { App, DiagnosticUrls } = tags;
+
+	const diagnosticUrlTemplates = DiagnosticUrls
+		? DiagnosticUrls.split(',')
+		: [];
+
+	const links = diagnosticUrlTemplates.map((diagnosticUrlTemplate) =>
+		addInsertsToTemplate(diagnosticUrlTemplate, Trigger, StateChangeTime),
+	);
+
+	const text = getText(
 		NewStateValue,
+		AlarmName,
 		AlarmDescription,
-		AWSAccountId,
-	} = message;
-
-	const app = await getAppNameTag(AlarmArn, AWSAccountId);
-	const teams = getTeams(app);
-
-	await Promise.all(
-		teams.map((team) => {
-			const webhookUrl = getTeamWebhookUrl(team);
-
-			const title =
-				NewStateValue === 'OK'
-					? `✅ *ALARM OK:* ${AlarmName} has recovered!`
-					: `🚨 *ALARM:* ${AlarmName} has triggered!`;
-			const text = `${title}\n\n*Description:* ${
-				AlarmDescription ?? ''
-			}\n\n*Reason:* ${NewStateReason}`;
-
-			console.log(`CloudWatch alarm from ${app} owned by ${team}`);
-
-			return fetch(webhookUrl, {
-				method: 'POST',
-				headers: { 'Content-Type': 'application/json' },
-				body: JSON.stringify({ text }),
-			});
-		}),
+		NewStateReason,
+		links,
 	);
-};
 
-const handleSnsPublishMessage = async ({
+	console.log(`CloudWatch alarm from ${App}, content ${text}`);
+
+	return text ? { app: App, text } : undefined;
+}
+
+function addInsertsToTemplate(
+	diagnosticUrlTemplate: string,
+	Trigger:
+		| {
+				Period: number;
+				EvaluationPeriods: number;
+		  }
+		| undefined,
+	StateChangeTime: Date,
+) {
+	const assumedTimeForCompositeAlarms = 300;
+	const alarmCoveredTimeSeconds = Trigger
+		? Trigger.EvaluationPeriods * Trigger.Period
+		: assumedTimeForCompositeAlarms;
+	const alarmEndTimeMillis = StateChangeTime.getTime();
+	const alarmStartTimeMillis =
+		alarmEndTimeMillis - 1000 * alarmCoveredTimeSeconds;
+
+	const url = diagnosticUrlTemplate
+		.replaceAll('$startMillis', `${alarmStartTimeMillis}`)
+		.replaceAll('$endMillis', `${alarmEndTimeMillis}`);
+
+	return url;
+}
+
+function getText(
+	NewStateValue: string,
+	AlarmName: string,
+	AlarmDescription: string | null | undefined,
+	NewStateReason: string,
+	links: string[],
+) {
+	const title =
+		NewStateValue === 'OK'
+			? `✅ *ALARM OK:* ${AlarmName} has recovered!`
+			: `🚨 *ALARM:* ${AlarmName} has triggered!`;
+	const text = [
+		title,
+		`*Description:* ${AlarmDescription ?? ''}`,
+		`*Reason:* ${NewStateReason}`,
+	]
+		.concat(links.map((link) => `*LogLink*: ${link}`))
+		.join('\n\n');
+	return text;
+}
+
+const getSnsPublishMessage = ({
 	message,
 	messageAttributes,
 }: {
@@ -106,21 +177,10 @@ const handleSnsPublishMessage = async ({
 	if (stage && stage !== 'PROD') return;
 
 	const app = messageAttributes.app?.Value;
-	const teams = getTeams(app);
 
-	await Promise.all(
-		teams.map((team) => {
-			const webhookUrl = getTeamWebhookUrl(team);
+	const text = message;
 
-			const text = message;
+	console.log(`SNS publish message from ${app}, content ${text}`);
 
-			console.log(`SNS publish message from ${app} owned by ${team}`);
-
-			return fetch(webhookUrl, {
-				method: 'POST',
-				headers: { 'Content-Type': 'application/json' },
-				body: JSON.stringify({ text }),
-			});
-		}),
-	);
+	return { app, text };
 };
diff --git a/handlers/alarms-handler/test/alarmMappings.test.ts b/handlers/alarms-handler/test/alarmMappings.test.ts
index 222bda04a7..79f49dd977 100644
--- a/handlers/alarms-handler/test/alarmMappings.test.ts
+++ b/handlers/alarms-handler/test/alarmMappings.test.ts
@@ -1,4 +1,6 @@
-import { getTeams } from '../src/alarmMappings';
+import { AlarmMappings } from '../src/alarmMappings';
+
+const { getTeams } = new AlarmMappings();
 
 describe('getTeam', () => {
 	it('returns the correct team for a given app', () => {
diff --git a/handlers/alarms-handler/test/index.test.ts b/handlers/alarms-handler/test/index.test.ts
index ebda8ac1c5..01a25aba47 100644
--- a/handlers/alarms-handler/test/index.test.ts
+++ b/handlers/alarms-handler/test/index.test.ts
@@ -1,6 +1,7 @@
-import { type SQSEvent } from 'aws-lambda';
-import { handler } from '../src';
-import { getAppNameTag } from '../src/cloudwatch';
+import { type SQSEvent, SQSRecord } from 'aws-lambda';
+import { getChatMessages, handler } from '../src';
+import { getTags } from '../src/cloudwatch';
+import { AlarmMappings } from '../src/alarmMappings';
 
 jest.mock('../src/cloudwatch');
 
@@ -23,6 +24,7 @@ describe('Handler', () => {
 						NewStateValue: 'ALARM',
 						AlarmDescription: 'description',
 						AWSAccountId: '111111',
+						StateChangeTime: '2024-10-09T07:23:16.236+0000',
 					}),
 				}),
 			},
@@ -51,7 +53,7 @@ describe('Handler', () => {
 	});
 
 	it('should handle CloudWatch alarm message', async () => {
-		(getAppNameTag as jest.Mock).mockResolvedValueOnce('mock-app');
+		(getTags as jest.Mock).mockResolvedValueOnce({ App: 'mock-app' });
 
 		jest
 			.spyOn(global, 'fetch')
@@ -59,11 +61,85 @@ describe('Handler', () => {
 
 		await handler(mockCloudWatchAlarmEvent);
 
-		expect(getAppNameTag).toHaveBeenCalledWith('mock-arn', '111111');
+		expect(getTags).toHaveBeenCalledWith('mock-arn', '111111');
 		expect(fetch).toHaveBeenCalledWith(mockEnv.SRE_WEBHOOK, expect.any(Object));
 	});
 
+	it('should handle captured CloudWatch alarm message', async () => {
+		(getTags as jest.Mock).mockResolvedValueOnce({
+			App: 'mock-app',
+			DiagnosticUrls:
+				'https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fmock-app-CODE/log-events$3Fstart$3D$startMillis$26filterPattern$3D$26end$3D$endMillis',
+		});
+
+		const result = await getChatMessages(
+			fullCloudWatchAlarmEvent,
+			new AlarmMappings({ SRE: ['mock-app'] }),
+		);
+
+		expect(getTags).toHaveBeenCalledWith(
+			'arn:aws:cloudwatch:eu-west-1:1234:alarm:DISCOUNT-API-CODE Discount-api 5XX response',
+			'1234',
+		);
+		const expectedText =
+			'🚨 *ALARM:* DISCOUNT-API-CODE Discount-api 5XX response has triggered!\n\n' +
+			'*Description:* Impact - Discount api returned a 5XX response check the logs for more information: https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fdiscount-api-CODE. Follow the process in https://docs.google.com/document/d/sdkjfhskjdfhksjdhf/edit\n\n' +
+			'*Reason:* Threshold Crossed: 1 datapoint [2.0 (09/10/24 07:18:00)] was greater than or equal to the threshold (1.0).\n\n' +
+			'*LogLink*: https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fmock-app-CODE/log-events$3Fstart$3D1728458296236$26filterPattern$3D$26end$3D1728458596236';
+		expect(result?.webhookUrls).toEqual([mockEnv.SRE_WEBHOOK]);
+		expect(result?.text).toEqual(expectedText);
+	});
+
+	it('should not insert if the DiagnosticUrls are empty', async () => {
+		(getTags as jest.Mock).mockResolvedValueOnce({ App: 'mock-app' });
+
+		const result = await getChatMessages(
+			fullCloudWatchAlarmEvent,
+			new AlarmMappings({ SRE: ['mock-app'] }),
+		);
+
+		expect(getTags).toHaveBeenCalledWith(
+			'arn:aws:cloudwatch:eu-west-1:1234:alarm:DISCOUNT-API-CODE Discount-api 5XX response',
+			'1234',
+		);
+		const expectedText =
+			'🚨 *ALARM:* DISCOUNT-API-CODE Discount-api 5XX response has triggered!\n\n' +
+			'*Description:* Impact - Discount api returned a 5XX response check the logs for more information: https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fdiscount-api-CODE. Follow the process in https://docs.google.com/document/d/sdkjfhskjdfhksjdhf/edit\n\n' +
+			'*Reason:* Threshold Crossed: 1 datapoint [2.0 (09/10/24 07:18:00)] was greater than or equal to the threshold (1.0).';
+		expect(result?.webhookUrls).toEqual([mockEnv.SRE_WEBHOOK]);
+		expect(result?.text).toEqual(expectedText);
+	});
+
+	it('should add multiple urls where specified', async () => {
+		(getTags as jest.Mock).mockResolvedValueOnce({
+			App: 'mock-app',
+			DiagnosticUrls: [
+				'https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fmock-app-CODE/log-events$3Fstart$3D$startMillis$26filterPattern$3D$26end$3D$endMillis',
+				'https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fanother-app-CODE/log-events$3Fstart$3D$startMillis$26filterPattern$3D$26end$3D$endMillis',
+			].join(','),
+		});
+
+		const result = await getChatMessages(
+			fullCloudWatchAlarmEvent,
+			new AlarmMappings({ SRE: ['mock-app'] }),
+		);
+
+		expect(getTags).toHaveBeenCalledWith(
+			'arn:aws:cloudwatch:eu-west-1:1234:alarm:DISCOUNT-API-CODE Discount-api 5XX response',
+			'1234',
+		);
+		const expectedText =
+			'🚨 *ALARM:* DISCOUNT-API-CODE Discount-api 5XX response has triggered!\n\n' +
+			'*Description:* Impact - Discount api returned a 5XX response check the logs for more information: https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fdiscount-api-CODE. Follow the process in https://docs.google.com/document/d/sdkjfhskjdfhksjdhf/edit\n\n' +
+			'*Reason:* Threshold Crossed: 1 datapoint [2.0 (09/10/24 07:18:00)] was greater than or equal to the threshold (1.0).\n\n' +
+			'*LogLink*: https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fmock-app-CODE/log-events$3Fstart$3D1728458296236$26filterPattern$3D$26end$3D1728458596236\n\n' +
+			'*LogLink*: https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fanother-app-CODE/log-events$3Fstart$3D1728458296236$26filterPattern$3D$26end$3D1728458596236';
+		expect(result?.webhookUrls).toEqual([mockEnv.SRE_WEBHOOK]);
+		expect(result?.text).toEqual(expectedText);
+	});
+
 	it('should handle SNS publish message', async () => {
+		(getTags as jest.Mock).mockResolvedValueOnce({});
 		jest
 			.spyOn(global, 'fetch')
 			.mockResolvedValue(Promise.resolve(new Response(JSON.stringify({}))));
@@ -74,6 +150,7 @@ describe('Handler', () => {
 	});
 
 	it('should throw error if the fetch HTTP call fails', async () => {
+		(getTags as jest.Mock).mockResolvedValueOnce({});
 		jest
 			.spyOn(global, 'fetch')
 			.mockResolvedValue(Promise.reject(new Error('Fetch error')));
@@ -84,7 +161,7 @@ describe('Handler', () => {
 	});
 
 	it('calls the webhook with the correct data for an OK action', async () => {
-		(getAppNameTag as jest.Mock).mockResolvedValueOnce('mock-app');
+		(getTags as jest.Mock).mockResolvedValueOnce({ App: 'mock-app' });
 		jest
 			.spyOn(global, 'fetch')
 			.mockResolvedValue(Promise.resolve(new Response(JSON.stringify({}))));
@@ -99,6 +176,7 @@ describe('Handler', () => {
 							NewStateValue: 'OK',
 							AlarmDescription: 'description',
 							AWSAccountId: '111111',
+							StateChangeTime: '2024-10-09T07:23:16.236+0000',
 						}),
 					}),
 				},
@@ -115,3 +193,64 @@ describe('Handler', () => {
 		);
 	});
 });
+
+const fullCloudWatchAlarmEvent = {
+	messageId: 'askjdhaskjhdjkashdakjsdjkashd',
+	receiptHandle: 'skdfhksjdfhksjdhfkjsdhfjkhsdfksd==',
+	body: JSON.stringify({
+		Type: 'Notification',
+		MessageId: 'sdkfjhslkdfhjksjdhfkjsdhf',
+		TopicArn: 'arn:aws:sns:eu-west-1:123456:alarms-handler-topic-CODE',
+		Subject:
+			'ALARM: "DISCOUNT-API-CODE Discount-api 5XX response" in EU (Ireland)',
+		Message: JSON.stringify({
+			AlarmName: 'DISCOUNT-API-CODE Discount-api 5XX response',
+			AlarmDescription:
+				'Impact - Discount api returned a 5XX response check the logs for more information: https://eu-west-1.console.aws.amazon.com/cloudwatch/home?region=eu-west-1#logsV2:log-groups/log-group/$252Faws$252Flambda$252Fdiscount-api-CODE. Follow the process in https://docs.google.com/document/d/sdkjfhskjdfhksjdhf/edit',
+			AWSAccountId: '1234',
+			AlarmConfigurationUpdatedTimestamp: '2024-09-23T09:21:15.363+0000',
+			NewStateValue: 'ALARM',
+			NewStateReason:
+				'Threshold Crossed: 1 datapoint [2.0 (09/10/24 07:18:00)] was greater than or equal to the threshold (1.0).',
+			StateChangeTime: '2024-10-09T07:23:16.236+0000',
+			Region: 'EU (Ireland)',
+			AlarmArn:
+				'arn:aws:cloudwatch:eu-west-1:1234:alarm:DISCOUNT-API-CODE Discount-api 5XX response',
+			OldStateValue: 'OK',
+			OKActions: [],
+			AlarmActions: ['arn:aws:sns:eu-west-1:1234:alarms-handler-topic-CODE'],
+			InsufficientDataActions: [],
+			Trigger: {
+				MetricName: '5XXError',
+				Namespace: 'AWS/ApiGateway',
+				StatisticType: 'Statistic',
+				Statistic: 'SUM',
+				Unit: null,
+				Dimensions: [[Object]],
+				Period: 300,
+				EvaluationPeriods: 1,
+				ComparisonOperator: 'GreaterThanOrEqualToThreshold',
+				Threshold: 1,
+				TreatMissingData: '',
+				EvaluateLowSampleCountPercentile: '',
+			},
+		}),
+		Timestamp: '2024-10-09T07:23:16.318Z',
+		SignatureVersion: '1',
+		Signature: 'skjefhksjdhfkjsdhfkjsdhfkjsdf==',
+		SigningCertURL: 'https://sns.eu-west-1.amazonaws.com/smhdfsmdfhgsdjf.pem',
+		UnsubscribeURL:
+			'https://sns.eu-west-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:eu-west-1:1234:alarms-handler-topic-CODE:sdkjfhsdkjfhskdjf',
+	}),
+	attributes: {
+		ApproximateReceiveCount: '1',
+		SentTimestamp: '1728458596353',
+		SenderId: 'askjdhaskjdhaksdj',
+		ApproximateFirstReceiveTimestamp: '1728458596364',
+	},
+	messageAttributes: {},
+	md5OfBody: 'askdjalksdjlasdjlaksjd',
+	eventSource: 'aws:sqs',
+	eventSourceARN: 'arn:aws:sqs:eu-west-1:1234:alarms-handler-queue-CODE',
+	awsRegion: 'eu-west-1',
+} as SQSRecord;
diff --git a/modules/arrayFunctions.ts b/modules/arrayFunctions.ts
index 852ace6829..59f7e45fa8 100644
--- a/modules/arrayFunctions.ts
+++ b/modules/arrayFunctions.ts
@@ -4,6 +4,7 @@ export const sum = <T>(array: T[], fn: (item: T) => number): number => {
 export const sumNumbers = (array: number[]): number => {
 	return sum(array, (item) => item);
 };
+
 export const groupBy = <T>(
 	array: T[],
 	fn: (item: T) => string,
@@ -17,6 +18,26 @@ export const groupBy = <T>(
 	}, {});
 };
 
+// TODO add tests
+export const mapValues = <K extends keyof any, V, N>(
+	records: Record<K, V>,
+	fn: (item: V) => N,
+): Record<K, N> => {
+	return Object.fromEntries(
+		Object.entries(records).map(([key, value]) => [key, fn(value as V)]),
+	) as Record<K, N>;
+};
+
+export const groupMap = <T, N>(
+	array: T[],
+	groupFn: (item: T) => string,
+	mapFn: (item: T) => N,
+): Record<string, N[]> => {
+	return mapValues(groupBy(array, groupFn), (groupedItems) =>
+		groupedItems.map(mapFn),
+	);
+};
+
 export const sortBy = <T>(array: T[], fn: (item: T) => string): T[] => {
 	return array.sort((posGT, negGT) => {
 		const posGTKey = fn(posGT);