From f69e6eb23fcf85eb0f30652710ffecc1b130e6b6 Mon Sep 17 00:00:00 2001 From: robertsweetman Date: Tue, 20 Aug 2024 16:54:40 +0100 Subject: [PATCH] use full application naming --- terraform/pagerduty/aws.tf | 122 +++++++++--------- .../pagerduty/member-services-integrations.tf | 34 ++--- 2 files changed, 70 insertions(+), 86 deletions(-) diff --git a/terraform/pagerduty/aws.tf b/terraform/pagerduty/aws.tf index 756904dba..410887883 100644 --- a/terraform/pagerduty/aws.tf +++ b/terraform/pagerduty/aws.tf @@ -18,67 +18,67 @@ resource "aws_secretsmanager_secret" "pagerduty_integration_keys" { resource "aws_secretsmanager_secret_version" "pagerduty_integration_keys" { secret_id = aws_secretsmanager_secret.pagerduty_integration_keys.id secret_string = jsonencode({ - core_alerts_cloudwatch = pagerduty_service_integration.core_alerts_cloudwatch.integration_key, - ddos_cloudwatch = pagerduty_service_integration.ddos_cloudwatch.integration_key, - tgw_cloudwatch = pagerduty_service_integration.tgw_cloudwatch.integration_key, - networking_cloudwatch = pagerduty_service_integration.networking_cloudwatch.integration_key, - operations_cloudwatch = pagerduty_service_integration.operations_cloudwatch.integration_key, - security_cloudwatch = pagerduty_service_integration.security_cloudwatch.integration_key, - nomis_alarms = pagerduty_service_integration.nomis_cloudwatch.integration_key, - nomis_nonprod_alarms = pagerduty_service_integration.nomis_nonprod_cloudwatch.integration_key, - laa_mlra_nonprod_alarms = pagerduty_service_integration.laa_mlra_nonprod_cloudwatch.integration_key, - laa_mlra_prod_alarms = pagerduty_service_integration.laa_mlra_prod_cloudwatch.integration_key, - laa_oas_nonprod_alarms = pagerduty_service_integration.laa_oas_nonprod_cloudwatch.integration_key, - laa_oas_prod_alarms = pagerduty_service_integration.laa_oas_prod_cloudwatch.integration_key, - jitbit_nonprod_alarms = pagerduty_service_integration.jitbit_nonprod_cloudwatch.integration_key, - jitbit_prod_alarms = pagerduty_service_integration.jitbit_prod_cloudwatch.integration_key, - iaps_nonprod_alarms = pagerduty_service_integration.iaps_nonprod_cloudwatch.integration_key, - iaps_prod_alarms = pagerduty_service_integration.iaps_prod_cloudwatch.integration_key, - laa_mojfin_prod_alarms = pagerduty_service_integration.laa_mojfin_prod_cloudwatch.integration_key, - laa_mojfin_non_prod_alarms = pagerduty_service_integration.laa_mojfin_non_prod_cloudwatch.integration_key, - hmpps_shef_dba_high_priority = pagerduty_service_integration.hmpps_shef_dba_high_priority.integration_key, - hmpps_shef_dba_low_priority = pagerduty_service_integration.hmpps_shef_dba_low_priority.integration_key, - hmpps_shef_dba_non_prod = pagerduty_service_integration.hmpps_shef_dba_non_prod.integration_key, - oasys_alarms = pagerduty_service_integration.oasys_cloudwatch.integration_key, - oasys_nonprod_alarms = pagerduty_service_integration.oasys_nonprod_cloudwatch.integration_key - test_alarms = pagerduty_service_integration.test_alarms.integration_key, - laa_portal_nonprod_alarms = pagerduty_service_integration.laa_portal_nonprod_cloudwatch.integration_key, - laa_portal_prod_alarms = pagerduty_service_integration.laa_portal_prod_cloudwatch.integration_key - laa_maat_nonprod_alarms = pagerduty_service_integration.laa_maat_nonprod_cloudwatch.integration_key, - laa_maat_prod_alarm = pagerduty_service_integration.laa_maat_prod_cloudwatch.integration_key, - csr_alarms = pagerduty_service_integration.csr_cloudwatch.integration_key, - dpr_nonprod_alarms = pagerduty_service_integration.dpr_nonprod_cloudwatch.integration_key, - planetfm_alarms = pagerduty_service_integration.planetfm_cloudwatch.integration_key, - ncas_non_prod_alarms = pagerduty_service_integration.ncas_non_prod_cloudwatch.integration_key, - ncas_prod_alarms = pagerduty_service_integration.ncas_prod_cloudwatch.integration_key, - wardship_non_prod_alarms = pagerduty_service_integration.wardship_non_prod_cloudwatch.integration_key, - wardship_prod_alarms = pagerduty_service_integration.wardship_prod_cloudwatch.integration_key, - pra_non_prod_alarms = pagerduty_service_integration.pra_non_prod_cloudwatch.integration_key, - pra_prod_alarms = pagerduty_service_integration.pra_prod_cloudwatch.integration_key, - tipstaff_non_prod_alarms = pagerduty_service_integration.tipstaff_non_prod_cloudwatch.integration_key, - tipstaff_prod_alarms = pagerduty_service_integration.tipstaff_prod_cloudwatch.integration_key, - dacp_non_prod_alarms = pagerduty_service_integration.dacp_non_prod_cloudwatch.integration_key, - dacp_prod_alarms = pagerduty_service_integration.dacp_prod_cloudwatch.integration_key, - laa_maat_api_nonprod_alarms = pagerduty_service_integration.laa_maat_api_nonprod_cloudwatch.integration_key, - laa_maat_api_prod_alarms = pagerduty_service_integration.laa_maat_api_prod_cloudwatch.integration_key, - hmpps_domain_services_prod_alarms = pagerduty_service_integration.hmpps_domain_services_prod_cloudwatch.integration_key, - hmpps_domain_services_nonprod_alarms = pagerduty_service_integration.hmpps_domain_services_nonprod_cloudwatch.integration_key - delius_core_nonprod_alarms = pagerduty_service_integration.delius_core_nonprod_cloudwatch.integration_key - delius_nextcloud_nonprod_alarms = pagerduty_service_integration.delius_nextcloud_nonprod_cloudwatch.integration_key - delius_nextcloud_prod_alarms = pagerduty_service_integration.delius_nextcloud_prod_cloudwatch.integration_key - laa_cwa_nonprod_alarms = pagerduty_service_integration.cwa_non_prod.integration_key - laa_cwa_prod_alarms = pagerduty_service_integration.cwa_prod.integration_key - nomis_data_hub_nonprod_alarms = pagerduty_service_integration.ndh_non_prod.integration_key - nomis_data_hub_prod_alarms = pagerduty_service_integration.ndh_prod.integration_key - laa_apex_nonprod_alarms = pagerduty_service_integration.apex_non_prod.integration_key - laa_apex_prod_alarms = pagerduty_service_integration.apex_prod.integration_key - delius_mis_nonprod_alarms = pagerduty_service_integration.delius_mis_non_prod.integration_key - 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.cdpt_ifs_cloudwatch.integration_key - csr_preproduction = pagerduty_service_integration.integrations["csr_preproduction"].integration_key - csr_production = pagerduty_service_integration.integrations["csr_production"].integration_key + core_alerts_cloudwatch = pagerduty_service_integration.core_alerts_cloudwatch.integration_key, + ddos_cloudwatch = pagerduty_service_integration.ddos_cloudwatch.integration_key, + tgw_cloudwatch = pagerduty_service_integration.tgw_cloudwatch.integration_key, + networking_cloudwatch = pagerduty_service_integration.networking_cloudwatch.integration_key, + operations_cloudwatch = pagerduty_service_integration.operations_cloudwatch.integration_key, + security_cloudwatch = pagerduty_service_integration.security_cloudwatch.integration_key, + nomis_alarms = pagerduty_service_integration.nomis_cloudwatch.integration_key, + nomis_nonprod_alarms = pagerduty_service_integration.nomis_nonprod_cloudwatch.integration_key, + laa_mlra_nonprod_alarms = pagerduty_service_integration.laa_mlra_nonprod_cloudwatch.integration_key, + laa_mlra_prod_alarms = pagerduty_service_integration.laa_mlra_prod_cloudwatch.integration_key, + laa_oas_nonprod_alarms = pagerduty_service_integration.laa_oas_nonprod_cloudwatch.integration_key, + laa_oas_prod_alarms = pagerduty_service_integration.laa_oas_prod_cloudwatch.integration_key, + jitbit_nonprod_alarms = pagerduty_service_integration.jitbit_nonprod_cloudwatch.integration_key, + jitbit_prod_alarms = pagerduty_service_integration.jitbit_prod_cloudwatch.integration_key, + iaps_nonprod_alarms = pagerduty_service_integration.iaps_nonprod_cloudwatch.integration_key, + iaps_prod_alarms = pagerduty_service_integration.iaps_prod_cloudwatch.integration_key, + laa_mojfin_prod_alarms = pagerduty_service_integration.laa_mojfin_prod_cloudwatch.integration_key, + laa_mojfin_non_prod_alarms = pagerduty_service_integration.laa_mojfin_non_prod_cloudwatch.integration_key, + hmpps_shef_dba_high_priority = pagerduty_service_integration.hmpps_shef_dba_high_priority.integration_key, + hmpps_shef_dba_low_priority = pagerduty_service_integration.hmpps_shef_dba_low_priority.integration_key, + hmpps_shef_dba_non_prod = pagerduty_service_integration.hmpps_shef_dba_non_prod.integration_key, + oasys_alarms = pagerduty_service_integration.oasys_cloudwatch.integration_key, + oasys_nonprod_alarms = pagerduty_service_integration.oasys_nonprod_cloudwatch.integration_key + test_alarms = pagerduty_service_integration.test_alarms.integration_key, + laa_portal_nonprod_alarms = pagerduty_service_integration.laa_portal_nonprod_cloudwatch.integration_key, + laa_portal_prod_alarms = pagerduty_service_integration.laa_portal_prod_cloudwatch.integration_key + laa_maat_nonprod_alarms = pagerduty_service_integration.laa_maat_nonprod_cloudwatch.integration_key, + laa_maat_prod_alarm = pagerduty_service_integration.laa_maat_prod_cloudwatch.integration_key, + csr_alarms = pagerduty_service_integration.csr_cloudwatch.integration_key, + dpr_nonprod_alarms = pagerduty_service_integration.dpr_nonprod_cloudwatch.integration_key, + planetfm_alarms = pagerduty_service_integration.planetfm_cloudwatch.integration_key, + ncas_non_prod_alarms = pagerduty_service_integration.ncas_non_prod_cloudwatch.integration_key, + ncas_prod_alarms = pagerduty_service_integration.ncas_prod_cloudwatch.integration_key, + wardship_non_prod_alarms = pagerduty_service_integration.wardship_non_prod_cloudwatch.integration_key, + wardship_prod_alarms = pagerduty_service_integration.wardship_prod_cloudwatch.integration_key, + pra_non_prod_alarms = pagerduty_service_integration.pra_non_prod_cloudwatch.integration_key, + pra_prod_alarms = pagerduty_service_integration.pra_prod_cloudwatch.integration_key, + tipstaff_non_prod_alarms = pagerduty_service_integration.tipstaff_non_prod_cloudwatch.integration_key, + tipstaff_prod_alarms = pagerduty_service_integration.tipstaff_prod_cloudwatch.integration_key, + dacp_non_prod_alarms = pagerduty_service_integration.dacp_non_prod_cloudwatch.integration_key, + dacp_prod_alarms = pagerduty_service_integration.dacp_prod_cloudwatch.integration_key, + laa_maat_api_nonprod_alarms = pagerduty_service_integration.laa_maat_api_nonprod_cloudwatch.integration_key, + laa_maat_api_prod_alarms = pagerduty_service_integration.laa_maat_api_prod_cloudwatch.integration_key, + hmpps_domain_services_prod_alarms = pagerduty_service_integration.hmpps_domain_services_prod_cloudwatch.integration_key, + hmpps_domain_services_nonprod_alarms = pagerduty_service_integration.hmpps_domain_services_nonprod_cloudwatch.integration_key + delius_core_nonprod_alarms = pagerduty_service_integration.delius_core_nonprod_cloudwatch.integration_key + delius_nextcloud_nonprod_alarms = pagerduty_service_integration.delius_nextcloud_nonprod_cloudwatch.integration_key + delius_nextcloud_prod_alarms = pagerduty_service_integration.delius_nextcloud_prod_cloudwatch.integration_key + laa_cwa_nonprod_alarms = pagerduty_service_integration.cwa_non_prod.integration_key + laa_cwa_prod_alarms = pagerduty_service_integration.cwa_prod.integration_key + nomis_data_hub_nonprod_alarms = pagerduty_service_integration.ndh_non_prod.integration_key + nomis_data_hub_prod_alarms = pagerduty_service_integration.ndh_prod.integration_key + laa_apex_nonprod_alarms = pagerduty_service_integration.apex_non_prod.integration_key + laa_apex_prod_alarms = pagerduty_service_integration.apex_prod.integration_key + delius_mis_nonprod_alarms = pagerduty_service_integration.delius_mis_non_prod.integration_key + 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.cdpt_ifs_cloudwatch.integration_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 }) } diff --git a/terraform/pagerduty/member-services-integrations.tf b/terraform/pagerduty/member-services-integrations.tf index ecfe5270d..596309118 100644 --- a/terraform/pagerduty/member-services-integrations.tf +++ b/terraform/pagerduty/member-services-integrations.tf @@ -2546,30 +2546,14 @@ resource "pagerduty_slack_connection" "chaps_slack" { locals { services = { - csr_preproduction = { - slack_channel_id = "C07J1UFEK25" # alarms_nonprod_csr - } - csr_production = { - slack_channel_id = "C07HQ17MY11" # alarms_prod_csr - } - # nomis_development = { - # # slack_channel_id = "TBD" # alarms_nonprod_nomis - # } - # nomis_test = { - # # slack_channel_id = "TBD" # alarms_nonprod_nomis - # } - # nomis_preproduction = { - # # slack_channel_id = "TBD" # alarms_nonprod_nomis - # } - # nomis_production = { - # # slack_channel_id = "TBD" # alarms_prod_nomis - # } - # planetfm_preproduction = { - # # slack_channel_id = "TBD" # alarms_nonprod_planetfm - # } - # planetfm_production = { - # # slack_channel_id = "TBD" # alarms_prod_planetfm - # } + corporate-staff-rostering-preproduction = { slack_channel_id = "C07J1UFEK25" } # corporate-staff-rostering-alarms-non-prod + corporate-staff-rostering-production = { slack_channel_id = "C07HQ17MY11" } # corporate-staff-rostering-alarms-prod + # nomis_development = { slack_channel_id = "TBD" } # nomis-alarms-non-prod + # nomis_test = { slack_channel_id = "TBD" } # nomis-alarms-non-prod + # nomis_preproduction = { slack_channel_id = "TBD" } # nomis-alarms-non-prod + # nomis_production = { slack_channel_id = "TBD" } # nomis-alarms-prod + # planetfm_preproduction = { slack_channel_id = "TBD" } # planetfm-alarms-non-prod + # planetfm_production = { slack_channel_id = "TBD" } # planetfm-alarms-prod } slack_events = [ "incident.triggered", @@ -2594,7 +2578,7 @@ locals { resource "pagerduty_service" "services" { for_each = local.services - name = "${each.key}" + name = each.key description = "${each.key}_alarms" auto_resolve_timeout = 345600 acknowledgement_timeout = "null"