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

fix kube deployment filters #53

Merged
merged 1 commit into from
Feb 14, 2024
Merged

fix kube deployment filters #53

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
3 changes: 2 additions & 1 deletion caas/kubernetes/workload/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ Creates DataDog monitors with the following checks:
| <a name="input_cronjob_extra_tags"></a> [cronjob\_extra\_tags](#input\_cronjob\_extra\_tags) | Extra tags for Cronjob monitor | `list(string)` | `[]` | no |
| <a name="input_cronjob_message"></a> [cronjob\_message](#input\_cronjob\_message) | Custom message for Cronjob monitor | `string` | `""` | no |
| <a name="input_cronjob_threshold_warning"></a> [cronjob\_threshold\_warning](#input\_cronjob\_threshold\_warning) | Cronjob monitor (warning threshold) | `string` | `3` | no |
| <a name="input_deployment_group_by"></a> [deployment\_group\_by](#input\_deployment\_group\_by) | Select group by element on deployment monitors | `list` | <pre>[<br> "kube_namespace",<br> "kube_deployment",<br> "kube_cluster_name"<br>]</pre> | no |
| <a name="input_environment"></a> [environment](#input\_environment) | Architecture Environment | `string` | n/a | yes |
| <a name="input_evaluation_delay"></a> [evaluation\_delay](#input\_evaluation\_delay) | Delay in seconds for the metric evaluation | `number` | `15` | no |
| <a name="input_filter_tags_custom"></a> [filter\_tags\_custom](#input\_filter\_tags\_custom) | Tags used for custom filtering when filter\_tags\_use\_defaults is false | `string` | `"*"` | no |
Expand Down Expand Up @@ -88,7 +89,7 @@ Creates DataDog monitors with the following checks:
| <a name="input_replica_current_threshold_critical"></a> [replica\_current\_threshold\_critical](#input\_replica\_current\_threshold\_critical) | Current replica critical threshold | `number` | `1` | no |
| <a name="input_replica_current_time_aggregator"></a> [replica\_current\_time\_aggregator](#input\_replica\_current\_time\_aggregator) | Monitor aggregator for Current replica [available values: min, max or avg] | `string` | `"max"` | no |
| <a name="input_replica_current_timeframe"></a> [replica\_current\_timeframe](#input\_replica\_current\_timeframe) | Monitor timeframe for Current replica [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | `string` | `"last_15m"` | no |
| <a name="input_replica_group_by"></a> [replica\_group\_by](#input\_replica\_group\_by) | Select group by element on monitors | `list` | <pre>[<br> "kube_namespace",<br> "kube_replica_set",<br> "kube_cluster_name"<br>]</pre> | no |
| <a name="input_replica_group_by"></a> [replica\_group\_by](#input\_replica\_group\_by) | Select group by element on replicaset monitors | `list` | <pre>[<br> "kube_namespace",<br> "kube_replica_set",<br> "kube_cluster_name"<br>]</pre> | no |
| <a name="input_replica_ready_enabled"></a> [replica\_ready\_enabled](#input\_replica\_ready\_enabled) | Flag to enable Ready replica monitor | `string` | `"true"` | no |
| <a name="input_replica_ready_extra_tags"></a> [replica\_ready\_extra\_tags](#input\_replica\_ready\_extra\_tags) | Extra tags for Ready replica monitor | `list(string)` | `[]` | no |
| <a name="input_replica_ready_message"></a> [replica\_ready\_message](#input\_replica\_ready\_message) | Custom message for Ready replica monitor | `string` | `""` | no |
Expand Down
6 changes: 5 additions & 1 deletion caas/kubernetes/workload/inputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ variable "replica_current_threshold_critical" {

variable "replica_group_by" {
default = ["kube_namespace", "kube_replica_set", "kube_cluster_name"]
description = "Select group by element on monitors"
description = "Select group by element on replicaset monitors"
}

variable "deployment_group_by" {
default = ["kube_namespace", "kube_deployment", "kube_cluster_name"]
description = "Select group by element on deployment monitors"
}
5 changes: 3 additions & 2 deletions caas/kubernetes/workload/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
locals {
replica_group_by = join(", ", var.replica_group_by)
}
replica_group_by = join(", ", var.replica_group_by)
deployment_group_by = join(", ", var.deployment_group_by)
}
4 changes: 2 additions & 2 deletions caas/kubernetes/workload/monitors-k8s-workload.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ resource "datadog_monitor" "replica_available" {

query = <<EOQ
${var.replica_available_time_aggregator}(${var.replica_available_timeframe}):
max:kubernetes_state.deployment.replicas_desired${module.filter-tags.query_alert} by {${local.replica_group_by}} -
max:kubernetes_state.deployment.replicas_available${module.filter-tags.query_alert} by {${local.replica_group_by}}
max:kubernetes_state.deployment.replicas_desired${module.filter-tags.query_alert} by {${local.deployment_group_by}} -
max:kubernetes_state.deployment.replicas_available${module.filter-tags.query_alert} by {${local.deployment_group_by}}
+ 1 < ${var.replica_available_threshold_critical}
EOQ

Expand Down
Loading