Skip to content

feat: [DTOSS-12086] set the secret and certificate‑expiry alert defaults to null #280

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

Merged
nc-shahidazim merged 1 commit into from
Feb 20, 2026
Merged

feat: [DTOSS-12086] set the secret and certificate‑expiry alert defaults to null #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions infrastructure/modules/key-vault/alerts.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "azurerm_monitor_scheduled_query_rules_alert_v2" "kv_secret_near_expiry" {
count = var.enable_alerting == true ? 1 : 0
count = var.enable_alerting == true && var.secret_near_expiry_alert != null ? 1 : 0

name = "${azurerm_key_vault.keyvault.name}-secret-near-expiry"
resource_group_name = var.resource_group_name_monitoring != null ? var.resource_group_name_monitoring : var.resource_group_name
Expand Down Expand Up @@ -48,7 +48,7 @@ QUERY
}

resource "azurerm_monitor_scheduled_query_rules_alert_v2" "kv_secret_expired" {
count = var.enable_alerting == true ? 1 : 0
count = var.enable_alerting == true && var.secret_expired_alert != null ? 1 : 0

name = "${azurerm_key_vault.keyvault.name}-secret-expired"
resource_group_name = var.resource_group_name_monitoring != null ? var.resource_group_name_monitoring : var.resource_group_name
Expand Down Expand Up @@ -97,7 +97,7 @@ QUERY
}

resource "azurerm_monitor_scheduled_query_rules_alert_v2" "kv_certificate_near_expiry" {
count = var.enable_alerting == true ? 1 : 0
count = var.enable_alerting == true && var.certificate_near_expiry_alert != null ? 1 : 0

name = "${azurerm_key_vault.keyvault.name}-certificate-near-expiry"
resource_group_name = var.resource_group_name_monitoring != null ? var.resource_group_name_monitoring : var.resource_group_name
Expand Down Expand Up @@ -146,7 +146,7 @@ QUERY
}

resource "azurerm_monitor_scheduled_query_rules_alert_v2" "kv_certificate_expired" {
count = var.enable_alerting == true ? 1 : 0
count = var.enable_alerting == true && var.certificate_expired_alert != null ? 1 : 0

name = "${azurerm_key_vault.keyvault.name}-certificate-expired"
resource_group_name = var.resource_group_name_monitoring != null ? var.resource_group_name_monitoring : var.resource_group_name
Expand Down
8 changes: 8 additions & 0 deletions infrastructure/modules/key-vault/tfdocs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ object({
})
```

Default: `null`

### <a name="input_secret_expired_alert"></a> [secret\_expired\_alert](#input\_secret\_expired\_alert)

Description: Configuration for the Key Vault secret expired alert.
Expand All @@ -184,6 +186,8 @@ object({
})
```

Default: `null`

### <a name="input_certificate_near_expiry_alert"></a> [certificate\_near\_expiry\_alert](#input\_certificate\_near\_expiry\_alert)

Description: Configuration for the Key Vault certificate near expiry alert.
Expand All @@ -198,6 +202,8 @@ object({
})
```

Default: `null`

### <a name="input_certificate_expired_alert"></a> [secret\_certificate\_alert](#input\_certificate\_expired\_alert)

Description: Configuration for the Key Vault certificate expired alert.
Expand All @@ -212,6 +218,8 @@ object({
})
```

Default: `null`

## Modules

The following Modules are called:
Expand Down
40 changes: 12 additions & 28 deletions infrastructure/modules/key-vault/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,20 @@ variable "secret_near_expiry_alert" {
validation {
condition = contains(
["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H", "P1D"],
var.secret_near_expiry_alert.evaluation_frequency
try(var.secret_near_expiry_alert.evaluation_frequency, "P1D")
)
error_message = "secret_near_expiry_alert.evaluation_frequency must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H, P1D"
}

validation {
condition = contains(
["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H", "P1D"],
var.secret_near_expiry_alert.window_duration
try(var.secret_near_expiry_alert.window_duration, "P1D")
)
error_message = "secret_near_expiry_alert.window_duration must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H, P1D"
}

default = {
evaluation_frequency = "P1D" # every 24 hours
window_duration = "P1D" # last 24 hours
threshold = 1
}
default = null
}

variable "secret_expired_alert" {
Expand All @@ -97,24 +93,20 @@ variable "secret_expired_alert" {
validation {
condition = contains(
["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H", "P1D"],
var.secret_expired_alert.evaluation_frequency
try(var.secret_expired_alert.evaluation_frequency, "PT15M")
)
error_message = "secret_expired_alert.evaluation_frequency must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H, P1D"
}

validation {
condition = contains(
["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H", "P1D"],
var.secret_expired_alert.window_duration
try(var.secret_expired_alert.window_duration, "PT1H")
)
error_message = "secret_expired_alert.window_duration must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H, P1D"
}

default = {
evaluation_frequency = "PT15M" # every 15 mins
window_duration = "PT1H" # last 1 hour
threshold = 1
}
default = null
}

variable "certificate_near_expiry_alert" {
Expand All @@ -127,24 +119,20 @@ variable "certificate_near_expiry_alert" {
validation {
condition = contains(
["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H", "P1D"],
var.certificate_near_expiry_alert.evaluation_frequency
try(var.certificate_near_expiry_alert.evaluation_frequency, "P1D")
)
error_message = "certificate_near_expiry_alert.evaluation_frequency must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H, P1D"
}

validation {
condition = contains(
["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H", "P1D"],
var.certificate_near_expiry_alert.window_duration
try(var.certificate_near_expiry_alert.window_duration, "P1D")
)
error_message = "certificate_near_expiry_alert.window_duration must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H, P1D"
}

default = {
evaluation_frequency = "P1D" # every 24 hours
window_duration = "P1D" # last 24 hours
threshold = 1
}
default = null
}

variable "certificate_expired_alert" {
Expand All @@ -157,24 +145,20 @@ variable "certificate_expired_alert" {
validation {
condition = contains(
["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H", "P1D"],
var.certificate_expired_alert.evaluation_frequency
try(var.certificate_expired_alert.evaluation_frequency, "PT15M")
)
error_message = "certificate_expired_alert.evaluation_frequency must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H, P1D"
}

validation {
condition = contains(
["PT1M", "PT5M", "PT15M", "PT30M", "PT1H", "PT6H", "PT12H", "P1D"],
var.certificate_expired_alert.window_duration
try(var.certificate_expired_alert.window_duration, "PT1H")
)
error_message = "certificate_expired_alert.window_duration must be one of: PT1M, PT5M, PT15M, PT30M, PT1H, PT6H, PT12H, P1D"
}

default = {
evaluation_frequency = "PT15M" # every 15 mins
window_duration = "PT1H" # last 1 hour
threshold = 1
}
default = null
}

variable "name" {
Expand Down
Loading