Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added cdpt-ifs to orchestration #8048

Merged
merged 8 commits into from
Oct 1, 2024
Merged

Added cdpt-ifs to orchestration #8048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb972f1
Added cdpt-ifs to orchestration
SteveLinden Sep 25, 2024
aaf8f14
removed secret for cdpt_ifs_cloudwatch to bypass error
SteveLinden Sep 25, 2024
e898878
Moved commented out section outside the list
SteveLinden Sep 25, 2024
36e8310
Fix routing key for cdpt_ifs_cloudwatch and sprinkley plus additional…
SteveLinden Sep 26, 2024
de9e833
Merge branch 'main' into feature/sprinkler-changes
SteveLinden Sep 26, 2024
9844afc
PR to amend Sprinkler to test changes on aws.tf
SteveLinden Sep 30, 2024
6a896c1
PR to amend Sprinkler to test removing the cdpt code
SteveLinden Sep 30, 2024
b1be54d
PR to amend Sprinkler to test - removed a section of the cdpt code
SteveLinden Oct 1, 2024
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
3 changes: 1 addition & 2 deletions terraform/pagerduty/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ resource "aws_secretsmanager_secret" "pagerduty_integration_keys" {
region = local.replica_region
}
}

resource "aws_secretsmanager_secret_version" "pagerduty_integration_keys" {
secret_id = aws_secretsmanager_secret.pagerduty_integration_keys.id
secret_string = jsonencode({
Expand Down Expand Up @@ -64,7 +63,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.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
hmpps-domain-services-development = pagerduty_service_integration.integrations["hmpps-domain-services-development"].integration_key
Expand Down
23 changes: 12 additions & 11 deletions terraform/pagerduty/member-services-integrations.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,6 +1789,9 @@ resource "pagerduty_slack_connection" "edw_prod" {

# Slack channel: #cdpt-integrated-fraud-system


# Slack channel: #cdpt-chaps

resource "pagerduty_service" "cdpt-ifs" {
name = "IFS loadbalancer alarm"
description = "IFS loadbalancer 5xx alarm"
Expand All @@ -1798,10 +1801,10 @@ resource "pagerduty_service" "cdpt-ifs" {
alert_creation = "create_alerts_and_incidents"
}

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_event_orchestration" "cdpt_ifs_cloudwatch" {
name = data.pagerduty_vendor.cloudwatch.name
description = "Integrates with PagerDuty"
team = pagerduty_team.modernisation_platform_members.id
}

resource "pagerduty_slack_connection" "ifs_slack" {
Expand Down Expand Up @@ -1833,8 +1836,6 @@ resource "pagerduty_slack_connection" "ifs_slack" {
}
}

# Slack channel: #cdpt-chaps

resource "pagerduty_service" "cdpt-chaps" {
name = "CHAPS loadbalancer alarm"
description = "CHAPS loadbalancer 5xx alarm"
Expand All @@ -1849,11 +1850,6 @@ resource "pagerduty_event_orchestration" "cdpt_chaps_cloudwatch" {
description = "Integrates with PagerDuty"
team = pagerduty_team.modernisation_platform_members.id
}
# name = data.pagerduty_vendor.cloudwatch.name
# service = pagerduty_service.cdpt-chaps.id
# vendor = data.pagerduty_vendor.cloudwatch.id
# }

resource "pagerduty_slack_connection" "chaps_slack" {
source_id = pagerduty_service.cdpt-chaps.id
source_type = "service_reference"
Expand Down Expand Up @@ -2188,6 +2184,11 @@ resource "pagerduty_event_orchestration" "monitor-sprinkler-integration" {
team = pagerduty_team.modernisation_platform.id
}

resource "pagerduty_event_orchestration_integration" "sprinkler_development_integration" {
event_orchestration = pagerduty_event_orchestration.monitor-sprinkler-integration.id
label = "Sprinkler development"
}

resource "pagerduty_slack_connection" "sprinkler_connection" {
source_id = pagerduty_service.sprinkler-development.id
source_type = "service_reference"
Expand Down