Skip to content

Commit

Permalink
updated dashboards
Browse files Browse the repository at this point in the history
  • Loading branch information
@drobinson-moj
drobinson-moj committed Dec 17, 2024
1 parent 6a96609 commit 5253245
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 0 deletions.
69 changes: 69 additions & 0 deletions terraform/environments/corporate-staff-rostering/locals_cloudwatch_dashboards.tf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
locals {

cloudwatch_dashboard_widget_groups = {
app = {
header_markdown = "## EC2 App Tier"
width = 8
height = 8
search_filter = {
ec2_tag = [
{ tag_name = "component", tag_value = "app" },
]
}
widgets = [
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.cpu-utilization-high,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.instance-status-check-failed,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.system-status-check-failed,
# CloudWatch agent not running, monitored by Glenn Bot instead
]
}

db = {
header_markdown = "## EC2 Oracle Database"
width = 8
height = 8
add_ebs_widgets = {
iops = true
throughput = true
}
search_filter = {
ec2_tag = [
{ tag_name = "component", tag_value = "data" },
]
}
widgets = [
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.cpu-utilization-high,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.instance-status-check-failed,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.system-status-check-failed,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_cwagent_linux.free-disk-space-low,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_cwagent_linux.high-memory-usage,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_cwagent_linux.cpu-iowait-high,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_linux.free-disk-space-low,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_service_status_os.service-status-error-os-layer,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_service_status_app.service-status-error-app-layer,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_oracle_db_connected.oracle-db-disconnected,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_oracle_db_backup.oracle-db-rman-backup-error,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_oracle_db_backup.oracle-db-rman-backup-did-not-run,
]
}

web = {
header_markdown = "## EC2 Web Tier"
width = 8
height = 8
search_filter = {
ec2_tag = [
{ tag_name = "component", tag_value = "web" },
]
}
widgets = [
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.cpu-utilization-high,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.instance-status-check-failed,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.system-status-check-failed,
# CloudWatch agent not running, monitored by Glenn Bot instead
]
}

}
}

14 changes: 14 additions & 0 deletions terraform/environments/corporate-staff-rostering/locals_preproduction.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ locals {
# please keep resources in alphabetical order
baseline_preproduction = {

cloudwatch_dashboards = {
"CloudWatch-Default" = {
periodOverride = "auto"
start = "-PT6H"
widget_groups = [
module.baseline_presets.cloudwatch_dashboard_widget_groups.network_lb,
local.cloudwatch_dashboard_widget_groups.db,
local.cloudwatch_dashboard_widget_groups.app,
local.cloudwatch_dashboard_widget_groups.web,
module.baseline_presets.cloudwatch_dashboard_widget_groups.ssm_command,
]
}
}

ec2_instances = {
pp-csr-db-a = merge(local.ec2_instances.db, {
config = merge(local.ec2_instances.db.config, {
Expand Down
82 changes: 82 additions & 0 deletions terraform/environments/corporate-staff-rostering/locals_production.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,86 @@ locals {
# please keep resources in alphabetical order
baseline_production = {

cloudwatch_dashboards = {
"CloudWatch-Default" = {
periodOverride = "auto"
start = "-PT6H"
widget_groups = [
module.baseline_presets.cloudwatch_dashboard_widget_groups.network_lb,
local.cloudwatch_dashboard_widget_groups.db,
local.cloudwatch_dashboard_widget_groups.app,
local.cloudwatch_dashboard_widget_groups.web,
module.baseline_presets.cloudwatch_dashboard_widget_groups.ssm_command,
]
}
"pd-csr-db-a" = {
periodOverride = "auto"
start = "-PT6H"
widget_groups = [
{
width = 8
height = 8
search_filter = { ec2_tag = [{ tag_name = "Name", tag_value = "pd-csr-db-a" }] }
widgets = [
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.cpu-utilization-high,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.instance-status-check-failed,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.system-status-check-failed,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_cwagent_linux.free-disk-space-low,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_cwagent_linux.high-memory-usage,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_cwagent_linux.cpu-iowait-high,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_linux.free-disk-space-low,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_service_status_os.service-status-error-os-layer,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_service_status_app.service-status-error-app-layer,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_oracle_db_connected.oracle-db-disconnected,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_oracle_db_backup.oracle-db-rman-backup-error,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_oracle_db_backup.oracle-db-rman-backup-did-not-run,
]
},
{
header_markdown = "## EBS PERFORMANCE"
width = 8
height = 8
add_ebs_widgets = { iops = true, throughput = true }
search_filter = { ec2_tag = [{ tag_name = "Name", tag_value = "pd-csr-db-a" }] }
widgets = []
}
]
}
"pd-csr-db-b" = {
periodOverride = "auto"
start = "-PT6H"
widget_groups = [
{
width = 8
height = 8
search_filter = { ec2_tag = [{ tag_name = "Name", tag_value = "pd-csr-db-b" }] }
widgets = [
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.cpu-utilization-high,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.instance-status-check-failed,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2.system-status-check-failed,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_cwagent_linux.free-disk-space-low,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_cwagent_linux.high-memory-usage,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_cwagent_linux.cpu-iowait-high,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_linux.free-disk-space-low,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_service_status_os.service-status-error-os-layer,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_service_status_app.service-status-error-app-layer,
module.baseline_presets.cloudwatch_dashboard_widgets.ec2_instance_cwagent_collectd_oracle_db_connected.oracle-db-disconnected,
null,
null,
]
},
{
header_markdown = "## EBS PERFORMANCE"
width = 8
height = 8
add_ebs_widgets = { iops = true, throughput = true }
search_filter = { ec2_tag = [{ tag_name = "Name", tag_value = "pd-csr-db-b" }] }
widgets = []
}
]
}
}

ec2_instances = {
pd-csr-db-a = merge(local.ec2_instances.db, {
config = merge(local.ec2_instances.db.config, {
Expand All @@ -38,6 +118,7 @@ locals {
ami = "base_ol_8_5"
description = "PD CSR Oracle primary DB server"
pre-migration = "PDCDL00013"
oracle-sids = "PIWFM"
})
})

Expand Down Expand Up @@ -68,6 +149,7 @@ locals {
ami = "base_ol_8_5"
description = "PD CSR Oracle secondary DB server"
pre-migration = "PDCDL00014"
oracle-sids = "DIWFM"
})
})

Expand Down

0 comments on commit 5253245

Please sign in to comment.