Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.1.0] Migrate monitors from locked to restricted roles #9

Merged
merged 2 commits into from
Jul 3, 2024
Merged

[3.1.0] Migrate monitors from locked to restricted roles #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1edc8ad
chore: bump datadog provider to 3.39
mlebee Jul 3, 2024
df86165
feat: start using restricted_roles parameter
mlebee Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ avg(${var.swap_percent_free_evaluation_period}):min:system.swap.pct_free{${local
| additional_tags | [] | No | Additional tags to set on the monitor. Good tagging can be hard but very useful to make cross sections of the environment. Datadog has a few default tags. https://docs.datadoghq.com/getting_started/tagging/ is a good place to start reading about tags |
| name_prefix | "" | No | Can be used to prefix to the Monitor name |
| name_suffix | "" | No | Can be used to suffix to the Monitor name |
| locked | True | No | |
| restricted_roles | [] | No | A list of unique role identifiers to define which roles are allowed to edit the monitor |
| service_check_include_tags | None | No | List of tags for the \"over\" part of the query. Can be either key:value tags or boolean tags. |
| service_check_exclude_tags | None | No | List of tags for the \"exclude\" part of the query. Can be either key:value tags or boolean tags. |
| priority_offset | 0 | No | For non production workloads we can +1 on the priorities |
Expand Down
6 changes: 3 additions & 3 deletions bytes-received.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "bytes_received" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Bytes received"
query = "avg(${var.bytes_received_evaluation_period}):avg:system.net.bytes_rcvd{${local.bytes_received_filter}} by {${var.alert_by}} > ${var.bytes_received_critical}"
Expand All @@ -29,7 +29,7 @@ module "bytes_received" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions bytes-sent.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "bytes_sent" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Bytes sent"
query = "avg(${var.bytes_sent_evaluation_period}):avg:system.net.bytes_sent{${local.bytes_sent_filter}} by {${var.alert_by}} > ${var.bytes_sent_critical}"
Expand All @@ -29,7 +29,7 @@ module "bytes_sent" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions cpu-stolen.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "cpu_stolen" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - High cpu.stolen usage"
query = "avg(${var.cpu_stolen_evaluation_period}):avg:system.cpu.stolen{${local.cpu_stolen_filter}} by {${var.alert_by}} > ${var.cpu_stolen_critical}"
Expand All @@ -29,7 +29,7 @@ module "cpu_stolen" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions cpu.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "cpu" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - High CPU"
query = "avg(${var.cpu_evaluation_period}):avg:system.cpu.user{${local.cpu_filter}} by {${var.alert_by}} + avg:system.cpu.system{${local.cpu_filter}} by {${var.alert_by}} > ${var.cpu_critical}"
Expand All @@ -29,7 +29,7 @@ module "cpu" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions dd-agent-data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "dd_agent_data" {
source = "kabisa/service-check-monitor/datadog"
version = "2.0.0"
source = "weglot/service-check-monitor/datadog"
version = "2.1.0"

name = "System - Datadog data missing"
metric_name = "datadog.agent.up"
Expand Down Expand Up @@ -41,7 +41,7 @@ module "dd_agent_data" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions dd-agent.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "dd_agent" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Datadog agent not running"
query = "avg(${var.dd_agent_evaluation_period}):avg:datadog.agent.running{${local.dd_agent_filter}} by {${var.alert_by}} < 1"
Expand All @@ -29,7 +29,7 @@ module "dd_agent" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions disk-free-bytes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "disk_free_bytes" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Disk Free (bytes)"
query = "avg(${var.disk_free_bytes_evaluation_period}):min:system.disk.free{${local.disk_free_bytes_filter}} by {host,device} < ${var.disk_free_bytes_critical}"
Expand All @@ -29,7 +29,7 @@ module "disk_free_bytes" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions disk-free-percent.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "disk_free_percent" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Disk Free (percentage)"
query = "avg(${var.disk_free_percent_evaluation_period}):100 * min:system.disk.free{${local.disk_free_percent_filter}} by {host,device} / min:system.disk.total{${local.disk_free_percent_filter}} by {host,device} < ${var.disk_free_percent_critical}"
Expand All @@ -29,7 +29,7 @@ module "disk_free_percent" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions disk-in-use-percentage.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "disk_in_use_percentage" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "Disk In Use Percentage"
query = "avg(${var.disk_in_use_percentage_evaluation_period}):min:system.disk.in_use{${local.disk_in_use_percentage_filter}} by {${var.alert_by}} * 100 > ${var.disk_in_use_percentage_critical}"
Expand All @@ -32,7 +32,7 @@ module "disk_in_use_percentage" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions disk-iowait.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "disk_io_wait" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Disk IO Wait"
query = "avg(${var.disk_io_wait_evaluation_period}):avg:system.cpu.iowait{${local.disk_io_wait_filter}} by {${var.alert_by}} > ${var.disk_io_wait_critical}"
Expand All @@ -29,7 +29,7 @@ module "disk_io_wait" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions memory-free-bytes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "memory_free_bytes" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Memory Free Bytes"
query = "avg(${var.memory_free_bytes_evaluation_period}):min:system.mem.usable{${local.memory_free_bytes_filter}} by {${var.alert_by}} < ${var.memory_free_bytes_critical}"
Expand All @@ -29,7 +29,7 @@ module "memory_free_bytes" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions memory-free-percent.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "memory_free_percent" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Memory Free Percent"
# Note: system.mem.pct_usable is actually a faction not a percentage
Expand All @@ -30,7 +30,7 @@ module "memory_free_percent" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions memory-usable-percent.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "memory_usable_percent" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "Memory Usable Percent"
query = "avg(${var.memory_usable_percent_evaluation_period}):100 * min:system.mem.usable{${local.memory_usable_percent_filter}} by {${var.alert_by}} / min:system.mem.total{${local.memory_usable_percent_filter}} by {${var.alert_by}} < ${var.memory_usable_percent_critical}"
Expand All @@ -32,7 +32,7 @@ module "memory_usable_percent" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
5 changes: 3 additions & 2 deletions ntp-check.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "ntp-check" {
source = "kabisa/service-check-monitor/datadog"
version = "2.0.0"
source = "weglot/service-check-monitor/datadog"
version = "2.1.0"

name = "System - NTP check"
metric_name = "ntp.in_sync"
Expand All @@ -23,6 +23,7 @@ module "ntp-check" {
additional_tags = var.additional_tags
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles

# monitor level vars
enabled = var.ntp_check_enabled
Expand Down
6 changes: 3 additions & 3 deletions packets-in-errors.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ locals {
}

module "packets_in_errors" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Packet In Errors"
# +1000 helps out filtering low packet rates, this prevents a handful of packet errors to skew the percentage when for example only 100 packets are received/sent
Expand All @@ -33,7 +33,7 @@ module "packets_in_errors" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions packets-out-errors.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "packets_out_errors" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Packet Out Errors"
# +1000 helps out filtering low packet rates, this prevents a handful of packet errors to skew the percentage when for example only 100 packets are received/sent
Expand All @@ -30,7 +30,7 @@ module "packets_out_errors" {
service_display_name = var.service_display_name
notification_channel = try(coalesce(var.packets_out_errors_notification_channel_override, var.notification_channel), "")
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions reboot.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "reboot" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Reboot detected"
query = "min(last_5m):derivative(max:system.uptime{${local.reboot_filter}} by {${var.alert_by}}) < 0"
Expand All @@ -30,7 +30,7 @@ module "reboot" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions required-services.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "required_services" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

for_each = var.required_services_config

Expand All @@ -33,7 +33,7 @@ module "required_services" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
6 changes: 3 additions & 3 deletions swap.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ locals {
}

module "swap_percent_free" {
source = "kabisa/generic-monitor/datadog"
version = "1.0.0"
source = "weglot/generic-monitor/datadog"
version = "1.1.0"

name = "System - Swap percent free"
query = "avg(${var.swap_percent_free_evaluation_period}):min:system.swap.pct_free{${local.swap_percent_free_filter}} by {${var.alert_by}} * 100 < ${var.swap_percent_free_critical}"
Expand All @@ -30,7 +30,7 @@ module "swap_percent_free" {
service = var.service
service_display_name = var.service_display_name
additional_tags = var.additional_tags
locked = var.locked
name_prefix = var.name_prefix
name_suffix = var.name_suffix
restricted_roles = var.restricted_roles
}
4 changes: 2 additions & 2 deletions terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ terraform {
required_providers {
datadog = {
source = "DataDog/datadog"
version = "~> 3.32"
version = "~> 3.39"
}
}

required_version = ">= 1.4.0"
required_version = ">= 1.7.0"

}
Loading