From 094b6ec89e6fa40d33e2f2046b1941a94dc69612 Mon Sep 17 00:00:00 2001 From: ep-93 <109581241+ep-93@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:29:46 +0100 Subject: [PATCH 1/3] Update member-services-integrations.tf --- terraform/pagerduty/member-services-integrations.tf | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/terraform/pagerduty/member-services-integrations.tf b/terraform/pagerduty/member-services-integrations.tf index c0d329f89..57d5e5e17 100644 --- a/terraform/pagerduty/member-services-integrations.tf +++ b/terraform/pagerduty/member-services-integrations.tf @@ -1809,15 +1809,10 @@ resource "pagerduty_service" "cdpt-ifs" { alert_creation = "create_alerts_and_incidents" } -resource "pagerduty_event_orchestration" "cdpt_ifs_cloudwatch" { - name = "cdpt_ifs_cloudwatch orchestration" - description = "Integrates with PagerDuty" - team = pagerduty_team.modernisation_platform_members.id -} - -resource "pagerduty_event_orchestration_integration" "cdpt_ifs_cloudwatch_integration" { - event_orchestration = pagerduty_event_orchestration.cdpt_ifs_cloudwatch.id - label = "CDPT IFS CloudWatch Integration" +resource "pagerduty_service_integration" "cdpt_ifs_cloudwatch" { + name = data.pagerduty_vendor.cloudwatch.name + service = pagerduty_service.cdpt-ifs.id + vendor = data.pagerduty_vendor.cloudwatch.id } resource "pagerduty_slack_connection" "ifs_slack" { From 53aef08f4a67f854fa493864e0c6d9c9a2ac4475 Mon Sep 17 00:00:00 2001 From: ep-93 <109581241+ep-93@users.noreply.github.com> Date: Mon, 14 Oct 2024 12:30:39 +0100 Subject: [PATCH 2/3] Update aws.tf --- terraform/pagerduty/aws.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/pagerduty/aws.tf b/terraform/pagerduty/aws.tf index c587dee89..55b8184e2 100644 --- a/terraform/pagerduty/aws.tf +++ b/terraform/pagerduty/aws.tf @@ -64,7 +64,7 @@ resource "aws_secretsmanager_secret_version" "pagerduty_integration_keys" { delius_mis_prod_alarms = pagerduty_service_integration.delius_mis_prod.integration_key laa_edw_nonprod_alarms = pagerduty_service_integration.edw_non_prod.integration_key laa_edw_prod_alarms = pagerduty_service_integration.edw_prod.integration_key - cdpt-ifs-alarms = pagerduty_event_orchestration_integration.cdpt_ifs_cloudwatch_integration.parameters[0].routing_key + cdpt-ifs-alarms = pagerduty_service_integration.edw_prod.integration_key sprinkler_development = pagerduty_event_orchestration_integration.sprinkler_development_integration.parameters[0].routing_key corporate-staff-rostering-preproduction = pagerduty_service_integration.integrations["corporate-staff-rostering-preproduction"].integration_key corporate-staff-rostering-production = pagerduty_service_integration.integrations["corporate-staff-rostering-production"].integration_key From 90fb398483ac1028bbe514d91c56f88034eb146f Mon Sep 17 00:00:00 2001 From: ep-93 <109581241+ep-93@users.noreply.github.com> Date: Tue, 15 Oct 2024 09:18:11 +0100 Subject: [PATCH 3/3] Update aws.tf --- terraform/pagerduty/aws.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/pagerduty/aws.tf b/terraform/pagerduty/aws.tf index 55b8184e2..348482c2a 100644 --- a/terraform/pagerduty/aws.tf +++ b/terraform/pagerduty/aws.tf @@ -64,7 +64,7 @@ resource "aws_secretsmanager_secret_version" "pagerduty_integration_keys" { delius_mis_prod_alarms = pagerduty_service_integration.delius_mis_prod.integration_key laa_edw_nonprod_alarms = pagerduty_service_integration.edw_non_prod.integration_key laa_edw_prod_alarms = pagerduty_service_integration.edw_prod.integration_key - cdpt-ifs-alarms = pagerduty_service_integration.edw_prod.integration_key + cdpt-ifs-alarms = pagerduty_service_integration.cdpt_ifs_cloudwatch.integration_key sprinkler_development = pagerduty_event_orchestration_integration.sprinkler_development_integration.parameters[0].routing_key corporate-staff-rostering-preproduction = pagerduty_service_integration.integrations["corporate-staff-rostering-preproduction"].integration_key corporate-staff-rostering-production = pagerduty_service_integration.integrations["corporate-staff-rostering-production"].integration_key