fix: remove the deprecated locked monitor option

philstevenson · philstevenson · commit 6ca47998183c · 2025-07-14T13:49:46.000+01:00
* setting `locked` to `null` avoids breaking change * The `locked` monitor option has been replaced with role-based access control: https://docs.datadoghq.com/monitors/guide/how-to-set-up-rbac-for-monitors/?tab=ui#migrate-monitors-from-locked-to-restricted-roles.
diff --git a/README.md b/README.md
diff --git a/cpu-limits-low-perc-state.tf b/cpu-limits-low-perc-state.tf
@@ -29,7 +29,7 @@ module "cpu_limits_low_perc_state" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/cpu-limits-low-perc.tf b/cpu-limits-low-perc.tf
@@ -29,7 +29,7 @@ module "cpu_limits_low_perc" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/cpu-limits-low.tf b/cpu-limits-low.tf
@@ -30,7 +30,7 @@ module "cpu_limits_low" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/cpu-on-dns-pods-high.tf b/cpu-on-dns-pods-high.tf
@@ -31,7 +31,7 @@ module "cpu_on_dns_pods_high" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/cpu-requests-low-perc-state.tf b/cpu-requests-low-perc-state.tf
@@ -29,7 +29,7 @@ module "cpu_requests_low_perc_state" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/cpu-requests-low-perc.tf b/cpu-requests-low-perc.tf
@@ -29,7 +29,7 @@ module "cpu_requests_low_perc" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/cpu-requests-low.tf b/cpu-requests-low.tf
@@ -29,7 +29,7 @@ module "cpu_requests_low" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/daemonset-incomplete.tf b/daemonset-incomplete.tf
@@ -29,7 +29,7 @@ module "daemonset_incomplete" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/daemonset-multiple-restarts.tf b/daemonset-multiple-restarts.tf
@@ -32,7 +32,7 @@ module "daemonset_multiple_restarts" {
   service              = var.service
   service_display_name = var.service_display_name
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/datadog-agent.tf b/datadog-agent.tf
@@ -31,7 +31,7 @@ module "datadog_agent" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/deploy-desired-vs-status.tf b/deploy-desired-vs-status.tf
@@ -31,7 +31,7 @@ module "deploy_desired_vs_status" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/deployment-multiple-restarts.tf b/deployment-multiple-restarts.tf
@@ -32,7 +32,7 @@ module "deployment_multiple_restarts" {
   service              = var.service
   service_display_name = var.service_display_name
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/hpa-status.tf b/hpa-status.tf
@@ -29,7 +29,7 @@ module "hpa_status" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/memory-limits-low-perc-state.tf b/memory-limits-low-perc-state.tf
@@ -29,7 +29,7 @@ module "memory_limits_low_perc_state" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/memory-limits-low-perc.tf b/memory-limits-low-perc.tf
@@ -29,7 +29,7 @@ module "memory_limits_low_perc" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/memory-limits-low.tf b/memory-limits-low.tf
@@ -29,7 +29,7 @@ module "memory_limits_low" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/memory-requests-low-perc-state.tf b/memory-requests-low-perc-state.tf
@@ -29,7 +29,7 @@ module "memory_requests_low_perc_state" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/memory-requests-low-perc.tf b/memory-requests-low-perc.tf
@@ -29,7 +29,7 @@ module "memory_requests_low_perc" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/memory-requests-low.tf b/memory-requests-low.tf
@@ -29,7 +29,7 @@ module "memory_requests_low" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/network-unavailable.tf b/network-unavailable.tf
@@ -29,7 +29,7 @@ module "network_unavailable" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/node-diskpressure.tf b/node-diskpressure.tf
@@ -29,7 +29,7 @@ module "node_diskpressure" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/node-memory-used-percent.tf b/node-memory-used-percent.tf
@@ -29,7 +29,7 @@ module "node_memory_used_percent" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/node-memorypressure.tf b/node-memorypressure.tf
@@ -29,7 +29,7 @@ module "node_memorypressure" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/node-ready.tf b/node-ready.tf
@@ -29,7 +29,7 @@ module "node_ready" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/node-status.tf b/node-status.tf
@@ -30,7 +30,7 @@ module "node_status" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/persistent-volumes.tf b/persistent-volumes.tf
@@ -29,7 +29,7 @@ module "persistent_volumes_low" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/pid-pressure.tf b/pid-pressure.tf
@@ -29,7 +29,7 @@ module "pid_pressure" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/pod-count-per-node-high.tf b/pod-count-per-node-high.tf
@@ -34,7 +34,7 @@ module "pod_count_per_node_high" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/pod-ready.tf b/pod-ready.tf
@@ -29,7 +29,7 @@ module "pod_ready" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/pod-restarts.tf b/pod-restarts.tf
@@ -29,7 +29,7 @@ module "pod_restarts" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/pods-failed.tf b/pods-failed.tf
@@ -32,7 +32,7 @@ module "pods_failed" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/pods-pending.tf b/pods-pending.tf
@@ -32,7 +32,7 @@ module "pods_pending" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/replicaset-incomplete.tf b/replicaset-incomplete.tf
@@ -29,7 +29,7 @@ module "replicaset_incomplete" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/replicaset-unavailable.tf b/replicaset-unavailable.tf
@@ -32,7 +32,7 @@ module "replicaset_unavailable" {
   service_display_name = var.service_display_name
   notification_channel = var.notification_channel
   additional_tags      = var.additional_tags
-  locked               = var.locked
+  locked               = null
   name_prefix          = var.name_prefix
   name_suffix          = var.name_suffix
 }
diff --git a/variables.tf b/variables.tf
@@ -27,12 +27,6 @@ variable "filter_str" {
   type = string
 }
 
-variable "locked" {
-  type        = bool
-  default     = true
-  description = "Makes sure only the creator or admin can modify the monitor."
-}
-
 variable "state_metrics_monitoring" {
   type    = bool
   default = true

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ module "cpu_limits_low_perc_state" {`
`29`	`29`	`service_display_name = var.service_display_name`
`30`	`30`	`notification_channel = var.notification_channel`
`31`	`31`	`additional_tags = var.additional_tags`
`32`		`- locked = var.locked`
	`32`	`+ locked = null`
`33`	`33`	`name_prefix = var.name_prefix`
`34`	`34`	`name_suffix = var.name_suffix`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ module "cpu_limits_low" {`
`30`	`30`	`service_display_name = var.service_display_name`
`31`	`31`	`notification_channel = var.notification_channel`
`32`	`32`	`additional_tags = var.additional_tags`
`33`		`- locked = var.locked`
	`33`	`+ locked = null`
`34`	`34`	`name_prefix = var.name_prefix`
`35`	`35`	`name_suffix = var.name_suffix`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ module "cpu_on_dns_pods_high" {`
`31`	`31`	`service_display_name = var.service_display_name`
`32`	`32`	`notification_channel = var.notification_channel`
`33`	`33`	`additional_tags = var.additional_tags`
`34`		`- locked = var.locked`
	`34`	`+ locked = null`
`35`	`35`	`name_prefix = var.name_prefix`
`36`	`36`	`name_suffix = var.name_suffix`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ module "cpu_requests_low_perc_state" {`
`29`	`29`	`service_display_name = var.service_display_name`
`30`	`30`	`notification_channel = var.notification_channel`
`31`	`31`	`additional_tags = var.additional_tags`
`32`		`- locked = var.locked`
	`32`	`+ locked = null`
`33`	`33`	`name_prefix = var.name_prefix`
`34`	`34`	`name_suffix = var.name_suffix`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ module "daemonset_incomplete" {`
`29`	`29`	`service_display_name = var.service_display_name`
`30`	`30`	`notification_channel = var.notification_channel`
`31`	`31`	`additional_tags = var.additional_tags`
`32`		`- locked = var.locked`
	`32`	`+ locked = null`
`33`	`33`	`name_prefix = var.name_prefix`
`34`	`34`	`name_suffix = var.name_suffix`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ module "daemonset_multiple_restarts" {`
`32`	`32`	`service = var.service`
`33`	`33`	`service_display_name = var.service_display_name`
`34`	`34`	`additional_tags = var.additional_tags`
`35`		`- locked = var.locked`
	`35`	`+ locked = null`
`36`	`36`	`name_prefix = var.name_prefix`
`37`	`37`	`name_suffix = var.name_suffix`
`38`	`38`	`}`