diff --git a/saas/new-relic/README.md b/saas/new-relic/README.md index 23a76b1..845dee6 100644 --- a/saas/new-relic/README.md +++ b/saas/new-relic/README.md @@ -1,10 +1,10 @@ -# SAAS NEW-RELIC DataDog monitors +# NEW-RELIC DataDog monitors ## How to use this module ``` -module "datadog-monitors-saas-new-relic" { - source = "git::ssh://git@git.fr.clara.net/claranet/pt-monitoring/projects/datadog/terraform/monitors.git//saas/new-relic?ref={revision}" +module "datadog-monitors-new-relic" { + source = "git::ssh://git@git.fr.clara.net/claranet/pt-monitoring/projects/datadog/terraform/monitors.git//new-relic?ref={revision}" environment = var.environment message = module.datadog-message-alerting.alerting-message @@ -20,47 +20,6 @@ Creates DataDog monitors with the following checks: - New Relic application has no-data - New Relic Error rate -## Inputs - -| Name | Description | Type | Default | Required | -|------|-------------|:----:|:-----:|:-----:| -| app\_apdex\_score\_enabled | Flag to enable APP Apdex Score monitor | string | `"true"` | no | -| app\_apdex\_score\_extra\_tags | Extra tags for New Relic APP Apdex Score monitor | list(string) | `[]` | no | -| app\_apdex\_score\_message | Custom message for the APP Apdex Score monitor | string | `""` | no | -| app\_apdex\_score\_threshold\_critical | APP Apdex Score critical threshold | string | `"0.25"` | no | -| app\_apdex\_score\_threshold\_warning | APP Apdex Score warning threshold | string | `"0.5"` | no | -| app\_apdex\_score\_time\_aggregator | Time aggregator for the APP Apdex Score monitor | string | `"avg"` | no | -| app\_apdex\_score\_timeframe | Timeframe for the APP Apdex Score monitor | string | `"last_15m"` | no | -| app\_error\_rate\_enabled | Flag to enable APP Error Rate monitor | string | `"true"` | no | -| app\_error\_rate\_extra\_tags | Extra tags for New Relic APP Error Rate monitor | list(string) | `[]` | no | -| app\_error\_rate\_message | Custom message for the APP Error Rate monitor | string | `""` | no | -| app\_error\_rate\_threshold\_critical | APP Error Rate critical threshold | string | `"5"` | no | -| app\_error\_rate\_threshold\_warning | APP Error Rate warning threshold | string | `"1"` | no | -| app\_error\_rate\_time\_aggregator | Time aggregator for the APP Error Rate monitor | string | `"min"` | no | -| app\_error\_rate\_timeframe | Timeframe for the APP Error Rate monitor | string | `"last_5m"` | no | -| data\_sent\_enabled | Flag to enable New Relic Data Sent monitor | string | `"true"` | no | -| data\_sent\_extra\_tags | Extra tags for New Relic Data Sent monitor | list(string) | `[]` | no | -| data\_sent\_message | Custom message for the New Relic Data Sent monitor | string | `""` | no | -| data\_sent\_no\_data\_timeframe | No data timeframe for the New Relic Data Sent monitor | string | `"30"` | no | -| data\_sent\_threshold\_critical | Critical threshold for the New Relic Data Sent monitor | string | `"0"` | no | -| data\_sent\_time\_aggregator | Time aggregator for the New Relic Data Sent monitor | string | `"avg"` | no | -| data\_sent\_timeframe | Timeframe for the New Relic Data Sent monitor | string | `"last_15m"` | no | -| environment | Architecture Environment | string | n/a | yes | -| evaluation\_delay | Delay in seconds for the metric evaluation | string | `"900"` | no | -| filter\_tags\_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `"*"` | no | -| filter\_tags\_custom\_excluded | Tags excluded for custom filtering when filter_tags_use_defaults is false | string | `""` | no | -| filter\_tags\_use\_defaults | Use default filter tags convention | string | `"true"` | no | -| message | Message sent when an alert is triggered | string | n/a | yes | -| new\_host\_delay | Delay in seconds before monitor new resource | string | `"300"` | no | -| prefix\_slug | Prefix string to prepend between brackets on every monitors names | string | `""` | no | - -## Outputs - -| Name | Description | -|------|-------------| -| app\_apdex\_score\_id | id for monitor app_apdex_score | -| app\_error\_rate\_id | id for monitor app_error_rate | -| data\_sent\_id | id for monitor data_sent | ## Related documentation diff --git a/saas/new-relic/inputs.tf b/saas/new-relic/inputs.tf index 47591fd..1f65996 100644 --- a/saas/new-relic/inputs.tf +++ b/saas/new-relic/inputs.tf @@ -156,12 +156,6 @@ variable "data_sent_timeframe" { default = "last_15m" } -variable "data_sent_threshold_critical" { - description = "Critical threshold for the New Relic Data Sent monitor" - type = string - default = 0 -} - variable "data_sent_no_data_timeframe" { description = "No data timeframe for the New Relic Data Sent monitor" type = string diff --git a/saas/new-relic/monitors-new-relic.tf b/saas/new-relic/monitors-new-relic.tf index fd0f95c..47a88b3 100644 --- a/saas/new-relic/monitors-new-relic.tf +++ b/saas/new-relic/monitors-new-relic.tf @@ -78,12 +78,12 @@ resource "datadog_monitor" "data_sent" { query = <