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

ncr alarm changes #7595

Merged
merged 1 commit into from
Aug 22, 2024
Merged

ncr alarm changes #7595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions terraform/environments/nomis-combined-reporting/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ locals {
"ec2_instance_oracle_db_with_backup",
"ec2_windows",
]
cloudwatch_metric_alarms_default_actions = ["pagerduty"]
cloudwatch_metric_oam_links_ssm_parameters = ["hmpps-oem-${local.environment}"]
cloudwatch_metric_oam_links = ["hmpps-oem-${local.environment}"]
db_backup_bucket_name = "ncr-db-backup-bucket"
Expand Down
38 changes: 19 additions & 19 deletions terraform/environments/nomis-combined-reporting/locals_cloudwatch_metric_alarms.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@ locals {

cloudwatch_metric_alarms = {
bip_app = merge(
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_cwagent_linux,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_instance_or_cwagent_stopped_linux,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_instance_cwagent_collectd_service_status_os,
# module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_instance_cwagent_collectd_service_status_app, # add in once there are custom services monitored
module.baseline_presets.cloudwatch_metric_alarms.ec2,
module.baseline_presets.cloudwatch_metric_alarms.ec2_cwagent_linux,
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_or_cwagent_stopped_linux,
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_cwagent_collectd_service_status_os,
# module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_cwagent_collectd_service_status_app, # add in once there are custom services monitored
)
bip_web = merge(
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_cwagent_linux,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_instance_or_cwagent_stopped_linux,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_instance_cwagent_collectd_service_status_os,
# module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_instance_cwagent_collectd_service_status_app, # add in once there are custom services monitored
module.baseline_presets.cloudwatch_metric_alarms.ec2,
module.baseline_presets.cloudwatch_metric_alarms.ec2_cwagent_linux,
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_or_cwagent_stopped_linux,
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_cwagent_collectd_service_status_os,
# module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_cwagent_collectd_service_status_app, # add in once there are custom services monitored
)
bods = merge(
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_cwagent_windows,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_instance_or_cwagent_stopped_linux,
module.baseline_presets.cloudwatch_metric_alarms.ec2,
module.baseline_presets.cloudwatch_metric_alarms.ec2_cwagent_windows,
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_or_cwagent_stopped_linux,
)
db = merge(
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dba_pagerduty"].ec2,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dba_pagerduty"].ec2_cwagent_linux,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dba_pagerduty"].ec2_instance_or_cwagent_stopped_linux,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dso_pagerduty"].ec2_instance_cwagent_collectd_service_status_os,
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dba_pagerduty"].ec2_instance_cwagent_collectd_service_status_app,
module.baseline_presets.cloudwatch_metric_alarms.ec2,
module.baseline_presets.cloudwatch_metric_alarms.ec2_cwagent_linux,
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_or_cwagent_stopped_linux,
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_cwagent_collectd_service_status_os,
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_cwagent_collectd_service_status_app,
)
db_connected = merge(
# DBAs have slack integration via OEM for this so don't include pagerduty integration
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_cwagent_collectd_oracle_db_connected,
)
db_backup = merge(
module.baseline_presets.cloudwatch_metric_alarms_by_sns_topic["dba_pagerduty"].ec2_instance_cwagent_collectd_oracle_db_backup,
module.baseline_presets.cloudwatch_metric_alarms.ec2_instance_cwagent_collectd_oracle_db_backup,
)
}
}
8 changes: 0 additions & 8 deletions terraform/environments/nomis-combined-reporting/locals_development.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@ locals {
# disabling some features in development as the environment may get nuked
cloudwatch_metric_oam_links_ssm_parameters = []
cloudwatch_metric_oam_links = []

sns_topics = {
pagerduty_integrations = {
dso_pagerduty = "nomis_nonprod_alarms"
dba_pagerduty = "hmpps_shef_dba_non_prod"
dba_high_priority_pagerduty = "hmpps_shef_dba_non_prod"
}
}
}
}

Expand Down
4 changes: 1 addition & 3 deletions terraform/environments/nomis-combined-reporting/locals_preproduction.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ locals {
options = {
sns_topics = {
pagerduty_integrations = {
dso_pagerduty = "nomis_alarms"
dba_pagerduty = "hmpps_shef_dba_low_priority"
dba_high_priority_pagerduty = "hmpps_shef_dba_low_priority"
pagerduty = "nomis-combined-reporting-preproduction"
}
}
}
Expand Down
4 changes: 1 addition & 3 deletions terraform/environments/nomis-combined-reporting/locals_production.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ locals {
options = {
sns_topics = {
pagerduty_integrations = {
dso_pagerduty = "nomis_alarms"
dba_pagerduty = "hmpps_shef_dba_low_priority"
dba_high_priority_pagerduty = "hmpps_shef_dba_high_priority"
pagerduty = "nomis-combined-reporting-production"
}
}
}
Expand Down
4 changes: 1 addition & 3 deletions terraform/environments/nomis-combined-reporting/locals_test.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ locals {
options = {
sns_topics = {
pagerduty_integrations = {
dso_pagerduty = "nomis_nonprod_alarms"
dba_pagerduty = "hmpps_shef_dba_non_prod"
dba_high_priority_pagerduty = "hmpps_shef_dba_non_prod"
pagerduty = "nomis-combined-reporting-test"
}
}
}
Expand Down
Loading