From de448bb087079458caa5549fd2e27f882c9d1596 Mon Sep 17 00:00:00 2001 From: Laurent Piroelle Date: Tue, 26 Jun 2018 17:51:10 +0200 Subject: [PATCH] MON-199 cleanup & minor fix --- databases/mongodb/README.md | 36 +++++++++++++++++++++--------------- databases/mongodb/inputs.tf | 22 +++++++++++----------- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/databases/mongodb/README.md b/databases/mongodb/README.md index 8dfb57b..8a15dc4 100644 --- a/databases/mongodb/README.md +++ b/databases/mongodb/README.md @@ -10,7 +10,7 @@ Add a user to MongoDB (on the primary instance) : ``` use admin -db.auth("admin", "admin-password") ## This is optional is you don't have any admin password +db.auth("admin", "admin-password") ## This is optional if you don't have any admin password db.createUser({"user":"datadog", "pwd": "{{PASSWORD}}", "roles" : [ {role: 'read', db: 'admin' }, {role: 'clusterMonitor', db: 'admin'}, {role: 'read', db: 'local' }]}) ``` @@ -84,24 +84,30 @@ Inputs | Name | Description | Type | Default | Required | |------|-------------|:----:|:-----:|:-----:| +| delay | Delay in seconds for the metric evaluation | string | `15` | no | | environment | Architecture Environment | string | - | yes | | filter_tags_custom | Tags used 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 | - | yes | -| mongodb_primary_message | Message sent when an alert is triggered on primary state | string | - | no | -| mongodb_secondary_message | Message sent when an alert is triggered on secondary state | string | - | no | -| mongodb_replication_message | Message sent when an alert is triggered on replication lag | string | - | no | -| mongodb_lag_warning | Replication lag in seconds to trigger a warn alert | string | 2 | no | -| mongodb_lag_critical | Replication lag in seconds to trigger a critical alert | string | 5 | no | -| mongodb_primary_silenced | Groups to mute for Mongodb primary state monitor | map | `` | no | -| mongodb_secondary_silenced | Groups to mute for Mongodb secondary state monitor | map | `` | no | -| mongodb_replication_silenced | Groups to mute for Mongodb replication lag monitor | map | `` | no | -| mongodb_replication_aggregator | Monitor aggregator for Mongodb state on primary node | string | available values: min, max | no | -| mongodb_replication_aggregator | Monitor aggregator for Mongodb state for secondaries | string | available values: min, max | no | -| mongodb_replication_aggregator | Monitor aggregator for Mongodb replication lag | string | available values: min, max, sum or avg | no | -| mongodb_primary_timeframe | Time frame for MongoDB primary state | string | available values: `last_#m` (1, 5, 10, 15, or 30) | no | -| mongodb_secondary_timeframe | Time frame for MongoDB secondary state | string | available values: `last_#m` (1, 5, 10, 15, or 30) | no | -| mongodb_replication_timeframe | Time frame for MongoDB replication lag | string | available values: `last_#m` (1, 5, 10, 15, or 30) | no | +| mongodb_desired_servers_count | Number of servers that should be instanciated for this cluster | string | `3` | no | +| mongodb_lag_critical | Critical replication lag in s | string | `5` | no | +| mongodb_lag_warning | Warn replication lag in s | string | `2` | no | +| mongodb_primary_aggregator | Monitor aggregator for MongoDB primary state [available values: min, max] | string | `max` | no | +| mongodb_primary_message | Custom message for MongoDB primary monitor | string | `` | no | +| mongodb_primary_silenced | Groups to mute for MongoDB primary state monitor | map | `` | no | +| mongodb_primary_timeframe | Monitor timeframe for MongoDB wrong state for primary node [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_1m` | no | +| mongodb_replication_aggregator | Monitor aggregator for MongoDB replication lag [available values: min, max, sum or avg] | string | `avg` | no | +| mongodb_replication_message | Custom message for MongoDB replication monitor | string | `` | no | +| mongodb_replication_silenced | Groups to mute for MongoDB replication lag monitor | map | `` | no | +| mongodb_replication_timeframe | Monitor timeframe for MongoDB replication lag [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_1m` | no | +| mongodb_secondary_aggregator | Monitor aggregator for MongoDB secondary state [available values: min, max] | string | `max` | no | +| mongodb_secondary_message | Custom message for MongoDB secondary monitor | string | `` | no | +| mongodb_secondary_silenced | Groups to mute for MongoDB secondary state monitor | map | `` | no | +| mongodb_secondary_timeframe | Monitor timeframe for MongoDB wrong state for secondaries nodes [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_5m` | no | +| mongodb_server_count_aggregator | Monitor aggregator for MongoDB server count [available values: min, max] | string | `min` | no | +| mongodb_server_count_message | Custom message for MongoDB server count | string | `` | no | +| mongodb_server_count_silenced | Groups to mute for MongoDB server count monitor | map | `` | no | +| mongodb_server_count_timeframe | Monitor timeframe for MongoDB wrong server count [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | Related documentation diff --git a/databases/mongodb/inputs.tf b/databases/mongodb/inputs.tf index 5dbc37f..3800ae5 100644 --- a/databases/mongodb/inputs.tf +++ b/databases/mongodb/inputs.tf @@ -42,7 +42,7 @@ variable "mongodb_secondary_timeframe" { } variable "mongodb_server_count_timeframe" { - description = "Monitor timeframe for MongoDB wrong state for secondaries nodes [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" + description = "Monitor timeframe for MongoDB wrong server count [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" type = "string" default = "last_15m" } @@ -64,25 +64,25 @@ variable "mongodb_lag_critical" { } variable "mongodb_primary_silenced" { - description = "Groups to mute for Mongodb primary state monitor" + description = "Groups to mute for MongoDB primary state monitor" type = "map" default = {} } variable "mongodb_secondary_silenced" { - description = "Groups to mute for Mongodb secondary state monitor" + description = "Groups to mute for MongoDB secondary state monitor" type = "map" default = {} } variable "mongodb_server_count_silenced" { - description = "Groups to mute for Mongodb secondary state monitor" + description = "Groups to mute for MongoDB server count monitor" type = "map" default = {} } variable "mongodb_replication_silenced" { - description = "Groups to mute for Mongodb replication lag monitor" + description = "Groups to mute for MongoDB replication lag monitor" type = "map" default = {} } @@ -100,7 +100,7 @@ variable "mongodb_secondary_message" { } variable "mongodb_server_count_message" { - description = "Custom message for MongoDB secondary monitor" + description = "Custom message for MongoDB server count" type = "string" default = "" } @@ -112,25 +112,25 @@ variable "mongodb_replication_message" { } variable "mongodb_primary_aggregator" { - description = "Monitor aggregator for Mongodb primary state [available values: min, max]" + description = "Monitor aggregator for MongoDB primary state [available values: min, max]" type = "string" default = "max" } variable "mongodb_secondary_aggregator" { - description = "Monitor aggregator for Mongodb secondary state [available values: min, max]" + description = "Monitor aggregator for MongoDB secondary state [available values: min, max]" type = "string" default = "max" } variable "mongodb_server_count_aggregator" { - description = "Monitor aggregator for Mongodb secondary state [available values: min, max]" + description = "Monitor aggregator for MongoDB server count [available values: min, max]" type = "string" - default = "max" + default = "min" } variable "mongodb_replication_aggregator" { - description = "Monitor aggregator for Mongodb replication lag [available values: min, max, sum or avg]" + description = "Monitor aggregator for MongoDB replication lag [available values: min, max, sum or avg]" type = "string" default = "avg" }