From 486f1c7514c3c8d1af3bc6af8c45ccda96d7d4f5 Mon Sep 17 00:00:00 2001 From: Rafael Romero Carmona Date: Fri, 27 Jul 2018 18:16:48 +0200 Subject: [PATCH] MON-224 Auto readme and outputs --- README.md | 1 + cloud/gcp/cloud-sql/instance/README.md | 32 +++++++++++++++---------- cloud/gcp/cloud-sql/instance/outputs.tf | 5 ++++ cloud/gcp/cloud-sql/mysql/README.md | 16 +++++++------ 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 892649a..0762021 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ The `//` is very important, it's a terraform specific syntax used to separate gi - [aws](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/) - [alb](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/alb/) - [apigateway](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/apigateway/) + - [ecs](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/ecs/) - [elasticsearch](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/elasticsearch/) - [elb](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/elb/) - [kinesis-firehose](https://bitbucket.org/morea/terraform.feature.datadog/src/master/cloud/aws/kinesis-firehose/) diff --git a/cloud/gcp/cloud-sql/instance/README.md b/cloud/gcp/cloud-sql/instance/README.md index 4350e35..60e7dbb 100644 --- a/cloud/gcp/cloud-sql/instance/README.md +++ b/cloud/gcp/cloud-sql/instance/README.md @@ -16,10 +16,11 @@ module "datadog-monitors-cloud-gcp-cloud-sql-instance" { Creates DataDog monitors with the following checks: -- Cloud SQL CPU Utilization -- Cloud SQL Disk Utilization +- Cloud SQL CPU utilization +- Cloud SQL Disk utilization +- Cloud SQL Disk utilization could reach - Cloud SQL Memory Utilization -- Cloud SQL Memory Utilization Forecast +- Cloud SQL Memory Utilization could reach - Cloud SQL Failover Unavailable ## Inputs @@ -29,15 +30,21 @@ Creates DataDog monitors with the following checks: | cpu_utilization_extra_tags | Extra tags for GCP Cloud SQL CPU Utilization monitor | list | `` | no | | cpu_utilization_message | Custom message for the CPU Utilization monitor | string | `` | no | | cpu_utilization_silenced | Groups to mute for GCP Cloud SQL CPU Utilization monitor | map | `` | no | -| cpu_utilization_threshold_critical | CPU Utilization in fraction (critical threshold) | string | `0.9` | no | -| cpu_utilization_threshold_warning | CPU Utilization in fraction (warning threshold) | string | `0.8` | no | -| cpu_utilization_timeframe | Timeframe for the CPU Utilization monitor | string | `last_30m` | no | +| cpu_utilization_threshold_critical | CPU Utilization in percentage (critical threshold) | string | `90` | no | +| cpu_utilization_threshold_warning | CPU Utilization in percentage (warning threshold) | string | `80` | no | +| cpu_utilization_timeframe | Timeframe for the CPU Utilization monitor | string | `last_15m` | no | | delay | Delay in seconds for the metric evaluation | string | `900` | no | | disk_utilization_extra_tags | Extra tags for GCP Cloud SQL CPU Utilization monitor | list | `` | no | +| disk_utilization_forecast_extra_tags | Extra tags for GCP Cloud SQL CPU Utilization monitor | list | `` | no | +| disk_utilization_forecast_message | Custom message for the Disk Utilization monitor | string | `` | no | +| disk_utilization_forecast_silenced | Groups to mute for GCP Cloud SQL Disk Utilization monitor | map | `` | no | +| disk_utilization_forecast_threshold_critical | Disk Utilization in percentage (critical threshold) | string | `80` | no | +| disk_utilization_forecast_threshold_critical_recovery | Disk Utilization in percentage (recovery threshold) | string | `72` | no | +| disk_utilization_forecast_timeframe | Timeframe for the Disk Utilization monitor | string | `next_1w` | no | | disk_utilization_message | Custom message for the Disk Utilization monitor | string | `` | no | | disk_utilization_silenced | Groups to mute for GCP Cloud SQL Disk Utilization monitor | map | `` | no | -| disk_utilization_threshold_critical | Disk Utilization in fraction (critical threshold) | string | `0.9` | no | -| disk_utilization_threshold_warning | Disk Utilization in fraction (warning threshold) | string | `0.8` | no | +| disk_utilization_threshold_critical | Disk Utilization in percentage (critical threshold) | string | `90` | no | +| disk_utilization_threshold_warning | Disk Utilization in percentage (warning threshold) | string | `80` | no | | disk_utilization_timeframe | Timeframe for the Disk Utilization monitor | string | `last_5m` | no | | environment | Architecture environment | string | - | yes | | failover_unavailable_extra_tags | Extra tags for GCP Cloud SQL Failover Unavailable monitor | list | `` | no | @@ -53,13 +60,13 @@ Creates DataDog monitors with the following checks: | memory_utilization_forecast_interval | Interval for the Memory Utilization Forecast monitor | string | `30m` | no | | memory_utilization_forecast_message | Custom message for the Memory Utilization Forecast monitor | string | `` | no | | memory_utilization_forecast_silenced | Groups to mute for GCP Cloud SQL Memory Utilization Forecast monitor | map | `` | no | -| memory_utilization_forecast_threshold_critical | Memory Utilization Forecast in fraction (critical threshold) | string | `0.9` | no | -| memory_utilization_forecast_threshold_warning | Memory Utilization Forecast in fraction (warning threshold) | string | `0.8` | no | +| memory_utilization_forecast_threshold_critical | Memory Utilization Forecast in percentage (warning threshold) | string | `90` | no | +| memory_utilization_forecast_threshold_critical_recovery | Memory Utilization Forecast in percentage (recovery threshold) | string | `81` | no | | memory_utilization_forecast_timeframe | Timeframe for the Memory Utilization Forecast monitor | string | `next_3d` | no | | memory_utilization_message | Custom message for the Memory Utilization monitor | string | `` | no | | memory_utilization_silenced | Groups to mute for GCP Cloud SQL Memory Utilization monitor | map | `` | no | -| memory_utilization_threshold_critical | Memory Utilization in fraction (critical threshold) | string | `0.9` | no | -| memory_utilization_threshold_warning | Memory Utilization in fraction (warning threshold) | string | `0.8` | no | +| memory_utilization_threshold_critical | Memory Utilization in percentage (critical threshold) | string | `90` | no | +| memory_utilization_threshold_warning | Memory Utilization in percentage (warning threshold) | string | `80` | no | | memory_utilization_timeframe | Timeframe for the Memory Utilization monitor | string | `last_5m` | no | | message | Message sent when a monitor is triggered | string | - | yes | | project_id | ID of the GCP Project | string | - | yes | @@ -69,6 +76,7 @@ Creates DataDog monitors with the following checks: | Name | Description | |------|-------------| | cpu_utilization_id | id for monitor cpu_utilization | +| disk_utilization_forecast_id | id for monitor disk_utilization_forecast | | disk_utilization_id | id for monitor disk_utilization | | failover_unavailable_id | id for monitor failover_unavailable | | memory_utilization_forecast_id | id for monitor memory_utilization_forecast | diff --git a/cloud/gcp/cloud-sql/instance/outputs.tf b/cloud/gcp/cloud-sql/instance/outputs.tf index 3fbeafd..8fb4292 100644 --- a/cloud/gcp/cloud-sql/instance/outputs.tf +++ b/cloud/gcp/cloud-sql/instance/outputs.tf @@ -8,6 +8,11 @@ output "disk_utilization_id" { value = "${datadog_monitor.disk_utilization.id}" } +output "disk_utilization_forecast_id" { + description = "id for monitor disk_utilization_forecast" + value = "${datadog_monitor.disk_utilization_forecast.id}" +} + output "memory_utilization_id" { description = "id for monitor memory_utilization" value = "${datadog_monitor.memory_utilization.id}" diff --git a/cloud/gcp/cloud-sql/mysql/README.md b/cloud/gcp/cloud-sql/mysql/README.md index 1b67001..dad3956 100644 --- a/cloud/gcp/cloud-sql/mysql/README.md +++ b/cloud/gcp/cloud-sql/mysql/README.md @@ -17,7 +17,7 @@ module "datadog-monitors-cloud-gcp-cloud-sql-mysql" { Creates DataDog monitors with the following checks: - Cloud SQL MySQL Network Connections (hard limit: ${var.network_connections_hard_limit}) -- Cloud SQL MySQL Replication Lag too high +- Cloud SQL MySQL Replication Lag - Cloud SQL MySQL Queries Count changed abnormally - Cloud SQL MySQL Questions Count changed abnormally @@ -38,7 +38,7 @@ Creates DataDog monitors with the following checks: | network_connections_threshold_warning | Number of network connections (warning threshold) | string | `3200` | no | | network_connections_timeframe | Timeframe for the Network Connections monitor | string | `last_15m` | no | | project_id | ID of the GCP Project | string | - | yes | -| queries_changing_anomaly_detection_algorithm | Anomaly Detection Algorithm used | string | `robust` | no | +| queries_changing_anomaly_detection_algorithm | Anomaly Detection Algorithm used | string | `agile` | no | | queries_changing_database_ids | List of database ids for the Queries Changing monitor | list | `` | no | | queries_changing_deviations | Deviations to detect the anomaly | string | `4` | no | | queries_changing_direction | Direction of the anomaly. It can be both, below or above. | string | `both` | no | @@ -47,9 +47,10 @@ Creates DataDog monitors with the following checks: | queries_changing_seasonality | Seasonality of the algorithm | string | `weekly` | no | | queries_changing_silenced | Groups to mute for GCP Cloud SQL Queries Changing monitor | map | `` | no | | queries_changing_threshold_critical | Queries Changing critical threshold | string | `1` | no | +| queries_changing_threshold_critical_recovery | Queries Changing critical recovery threshold | string | `0.99` | no | | queries_changing_threshold_warning | Queries Changing warning threshold | string | `0.5` | no | -| queries_changing_timeframe | Timeframe for the Queries Changing mon monitor | string | `last_10m` | no | -| questions_changing_anomaly_detection_algorithm | Anomaly Detection Algorithm used | string | `robust` | no | +| queries_changing_timeframe | Timeframe for the Queries Changing mon monitor | string | `last_1h` | no | +| questions_changing_anomaly_detection_algorithm | Anomaly Detection Algorithm used | string | `agile` | no | | questions_changing_database_ids | List of database ids for the Questions Changing monitor | list | `` | no | | questions_changing_deviations | Deviations to detect the anomaly | string | `4` | no | | questions_changing_direction | Direction of the anomaly. It can be both, below or above. | string | `both` | no | @@ -58,13 +59,14 @@ Creates DataDog monitors with the following checks: | questions_changing_seasonality | Seasonality of the algorithm | string | `weekly` | no | | questions_changing_silenced | Groups to mute for GCP Cloud SQL Questions Changing monitor | map | `` | no | | questions_changing_threshold_critical | Questions Changing critical threshold | string | `1` | no | +| questions_changing_threshold_critical_recovery | Questions Changing critical recovery threshold | string | `0.99` | no | | questions_changing_threshold_warning | Questions Changing warning threshold | string | `0.5` | no | -| questions_changing_timeframe | Timeframe for the Questions Changing monitor | string | `last_10m` | no | +| questions_changing_timeframe | Timeframe for the Questions Changing monitor | string | `last_1h` | no | | replication_lag_extra_tags | Extra tags for GCP Cloud SQL SQL Replication monitor | list | `` | no | | replication_lag_message | Custom message for the Replication Lag monitor | string | `` | no | | replication_lag_silenced | Groups to mute for GCP Cloud SQL Replication Lag monitor | map | `` | no | -| replication_lag_threshold_critical | Seconds behind the master (critical threshold) | string | `900` | no | -| replication_lag_threshold_warning | Seconds behind the master (warning threshold) | string | `300` | no | +| replication_lag_threshold_critical | Seconds behind the master (critical threshold) | string | `180` | no | +| replication_lag_threshold_warning | Seconds behind the master (warning threshold) | string | `90` | no | | replication_lag_timeframe | Timeframe for the Replication Lag monitor | string | `last_10m` | no | ## Outputs