diff --git a/database/zookeeper/README.md b/database/zookeeper/README.md index 2109ada..5db9669 100644 --- a/database/zookeeper/README.md +++ b/database/zookeeper/README.md @@ -32,23 +32,18 @@ Creates DataDog monitors with the following checks: | message | Message sent when a monitor is triggered | `any` | n/a | yes | | new\_host\_delay | Delay in seconds before begin to monitor new host | `number` | `300` | no | | not\_responding\_group\_by | List of tags to use to group data | `list(string)` |
[
"host",
"server"
]
| no | -| not\_responding\_locked | Lock Zookeeper not responding monitor | `bool` | `false` | no | | not\_responding\_no\_data\_timeframe | Zookeeper monitor no\_data\_timeframe | `number` | `10` | no | -| not\_responding\_notify\_audit | Enable or not notify audit on Zookeeper not responding monitor | `bool` | `false` | no | | not\_responding\_notify\_no\_data | Send notification if not\_responding monitor does not retrieve data | `bool` | `true` | no | | not\_responding\_threshold\_warning | Zookeeper not responding limit (warning threshold) | `number` | `3` | no | -| not\_responding\_timeout\_h | Number of hour of Zookeeper not responding monitor not reporting data before it will automatically resolve from a triggered state | `number` | `0` | no | | prefix\_slug | Prefix string to prepend between brackets on every monitors names | `string` | `""` | no | | zookeeper\_latency\_availability\_extra\_tags | Extra tags for zookeeper read latency monitor | `list(string)` | `[]` | no | | zookeeper\_latency\_enabled | Flag to enable Zookeeper read latency monitor | `string` | `"true"` | no | | zookeeper\_latency\_group\_by | Tags to use to group datas | `list(string)` |
[
"host"
]
| no | -| zookeeper\_latency\_notify\_audit | Enable or not notify audit on Zookeeper latency monitor | `bool` | `false` | no | | zookeeper\_latency\_status\_message | Custom message for Zookeeper read latency monitor | `string` | `""` | no | | zookeeper\_latency\_threshold\_critical | Maximum critical acceptable ms of zookeeper latency monitor | `number` | `300000` | no | | zookeeper\_latency\_threshold\_warning | Maximum warning acceptable ms of zookeeper latency monitor | `number` | `250000` | no | | zookeeper\_latency\_time\_aggregator | Monitor time aggregator for Zookeeper read latency monitor [available values: min, max or avg] | `string` | `"avg"` | no | | zookeeper\_latency\_timeframe | Monitor timeframe for Zookeeper read latency monitor [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | `string` | `"last_15m"` | no | -| zookeeper\_latency\_timeout\_h | Number of hour of Zookeeper latency monitor not reporting data before it will automatically resolve from a triggered state | `number` | `0` | no | | zookeeper\_not\_responding\_enabled | Flag to enable Zookeeper does not respond monitor | `string` | `"true"` | no | | zookeeper\_not\_responding\_extra\_tags | Extra tags for Zookeeper does not respond monitor | `list(string)` | `[]` | no | | zookeeper\_not\_responding\_message | Custom message for Zookeeper does not respond monitor | `string` | `""` | no | @@ -63,5 +58,5 @@ Creates DataDog monitors with the following checks: | not\_responding\_id | id for monitor not\_responding | ## Related documentation -* [Integration Datadog & ElasticSearch](https://docs.datadoghq.com/integrations/elastic/) -* [How to monitor ElasticSearch with Datadog](https://www.datadoghq.com/blog/monitor-elasticsearch-datadog/) + +DataDog documentation: [https://docs.datadoghq.com/integrations/zk/](https://docs.datadoghq.com/integrations/zk/) diff --git a/database/zookeeper/inputs.tf b/database/zookeeper/inputs.tf index 73ddf01..3874747 100644 --- a/database/zookeeper/inputs.tf +++ b/database/zookeeper/inputs.tf @@ -96,24 +96,6 @@ variable "not_responding_threshold_warning" { description = "Zookeeper not responding limit (warning threshold)" } -variable "not_responding_notify_audit" { - description = "Enable or not notify audit on Zookeeper not responding monitor" - type = bool - default = false -} - -variable "not_responding_locked" { - description = "Lock Zookeeper not responding monitor" - type = bool - default = false -} - -variable "not_responding_timeout_h" { - description = "Number of hour of Zookeeper not responding monitor not reporting data before it will automatically resolve from a triggered state" - type = number - default = 0 -} - # # Check read latency monitor # @@ -163,14 +145,3 @@ variable "zookeeper_latency_availability_extra_tags" { default = [] } -variable "zookeeper_latency_notify_audit" { - description = "Enable or not notify audit on Zookeeper latency monitor" - type = bool - default = false -} - -variable "zookeeper_latency_timeout_h" { - description = "Number of hour of Zookeeper latency monitor not reporting data before it will automatically resolve from a triggered state" - type = number - default = 0 -} diff --git a/database/zookeeper/modules.tf b/database/zookeeper/modules.tf index 6b17d21..f0cf5b4 100644 --- a/database/zookeeper/modules.tf +++ b/database/zookeeper/modules.tf @@ -8,13 +8,3 @@ module "filter-tags" { filter_tags_custom_excluded = var.filter_tags_custom_excluded } -module "filter-tags-check-process" { - source = "../../common/filter-tags" - - environment = var.environment - resource = "zookeeper" - filter_tags_use_defaults = var.filter_tags_use_defaults - filter_tags_custom = var.filter_tags_custom - filter_tags_custom_excluded = var.filter_tags_custom_excluded - extra_tags = ["dd_process_name:zookeeper"] -} diff --git a/database/zookeeper/monitors-zookeeper.tf b/database/zookeeper/monitors-zookeeper.tf index d6ee28e..884bb6a 100644 --- a/database/zookeeper/monitors-zookeeper.tf +++ b/database/zookeeper/monitors-zookeeper.tf @@ -16,9 +16,9 @@ EOQ no_data_timeframe = var.not_responding_no_data_timeframe new_host_delay = var.new_host_delay notify_no_data = var.not_responding_notify_no_data - notify_audit = var.not_responding_notify_audit - locked = var.not_responding_locked - timeout_h = var.not_responding_timeout_h + notify_audit = false + locked = false + timeout_h = 0 include_tags = true require_full_window = true renotify_interval = 0 @@ -50,8 +50,8 @@ EOQ notify_no_data = false evaluation_delay = var.evaluation_delay new_host_delay = var.new_host_delay - notify_audit = var.zookeeper_latency_notify_audit - timeout_h = var.zookeeper_latency_timeout_h + notify_audit = false + timeout_h = 0 include_tags = true locked = false require_full_window = true